# HG changeset patch
# User Chris Cannam
# Date 1395071775 0
# Node ID 8c26ccf3641679ab076de0e6d08577bb54244a52
# Parent  b946346870ae3b30ef62a9fdec3a004eedf64de2
Update to use jzy3d v0.9.1 and JOGL v2.1.5

diff -r b946346870ae -r 8c26ccf36416 .hgsubstate
--- a/.hgsubstate	Mon Mar 17 15:21:48 2014 +0000
+++ b/.hgsubstate	Mon Mar 17 15:56:15 2014 +0000
@@ -1,1 +1,1 @@
-0a4af51413b7ddd1cc4c058fb732556b849cac21 ext
+ea762d69743ec57dd9f10dbfc3ff87ffacf64565 ext
diff -r b946346870ae -r 8c26ccf36416 bin/may
--- a/bin/may	Mon Mar 17 15:21:48 2014 +0000
+++ b/bin/may	Mon Mar 17 15:56:15 2014 +0000
@@ -30,7 +30,7 @@
     YETI_LIBDIR=$YLDIR/../other/yeti
 fi
 
-CLASSPATH=$YLDIR/may.jar:$JARDIR/ayr.jar:$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JARDIR/jline-2.11-SNAPSHOT.jar:$JARDIR/jvamp.jar:$JARDIR/yertle.jar:$JARDIR/jtransforms-2.4.jar:$JARDIR/org.jzy3d-0.9.jar:$JARDIR/jogl-all.jar:$JARDIR/gluegen.jar:$JARDIR/gluegen-rt.jar:$JARDIR/opencsv-2.1.jar:$JARDIR/org.convexhull.jar:$CLASSPATH
+CLASSPATH=$YLDIR/may.jar:$JARDIR/ayr.jar:$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JARDIR/jline-2.11-SNAPSHOT.jar:$JARDIR/jvamp.jar:$JARDIR/yertle.jar:$JARDIR/jtransforms-2.4.jar:$JARDIR/jzy3d-swt-0.9.1.jar:$JARDIR/jzy3d-api-0.9.1.jar:$JARDIR/jogl-all.jar:$JARDIR/gluegen.jar:$JARDIR/gluegen-rt.jar:$JARDIR/opencsv-2.1.jar:$JARDIR/org.convexhull.jar:$CLASSPATH
 
 YETI_MODULE_SOURCE_PATH=${YETI_LIBDIR}/modules \
     LD_LIBRARY_PATH=$SODIR:$LD_LIBRARY_PATH \
diff -r b946346870ae -r 8c26ccf36416 bin/may.bat
--- a/bin/may.bat	Mon Mar 17 15:21:48 2014 +0000
+++ b/bin/may.bat	Mon Mar 17 15:56:15 2014 +0000
@@ -1,3 +1,3 @@
 @echo off
 set MAY_INIT_MODULES=may.vector;may.matrix;may.complex;may.plot;may.vamp
-java -classpath "may.jar;ext\jar\ayr.jar;..\yeti\yeti.jar;ext\jar\jline-2.11-SNAPSHOT.jar;ext\jar\jvamp.jar;ext\jar\yertle.jar;ext\jar\jtransforms-2.4.jar;ext\jar\org.jzy3d-0.9.jar;ext\jar\jogl-all.jar;ext\jar\gluegen.jar;ext\jar\opencsv-2.1.jar;ext\jar\org.convexhull.jar" -Djava.library.path=ext\native\win64 com.particularprograms.ayr -init "%MAY_INIT_MODULES%"
+java -classpath "may.jar;ext\jar\ayr.jar;..\yeti\yeti.jar;ext\jar\jline-2.11-SNAPSHOT.jar;ext\jar\jvamp.jar;ext\jar\yertle.jar;ext\jar\jtransforms-2.4.jar;ext\jar\jzy3d-swt-0.9.1.jar;ext\jar\jzy3d-api-0.9.1.jar;ext\jar\jogl-all.jar;ext\jar\gluegen.jar;ext\jar\opencsv-2.1.jar;ext\jar\org.convexhull.jar" -Djava.library.path=ext\native\win64 com.particularprograms.ayr -init "%MAY_INIT_MODULES%"
diff -r b946346870ae -r 8c26ccf36416 bin/yc
--- a/bin/yc	Mon Mar 17 15:21:48 2014 +0000
+++ b/bin/yc	Mon Mar 17 15:56:15 2014 +0000
@@ -34,7 +34,7 @@
     shift
 fi
 
-CLASSPATH=${YLJAR_WITH_COLON}$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JARDIR/jvamp.jar:$JARDIR/yertle.jar:$JARDIR/jtransforms-2.4.jar:$JARDIR/org.jzy3d-0.9.jar:$JARDIR/jogl-all.jar:$JARDIR/gluegen.jar:$JARDIR/gluegen-rt.jar:$JARDIR/misc/opencsv-2.1.jar:$JARDIR/misc/org.convexhull.jar:$JARDIR/misc/swt.jar:$CLASSPATH
+CLASSPATH=${YLJAR_WITH_COLON}$YETI_LIBDIR/yeti.jar:$YETI_LIBDIR/yeti-lib.jar:$JARDIR/jvamp.jar:$JARDIR/yertle.jar:$JARDIR/jtransforms-2.4.jar:$JARDIR/jzy3d-swt-0.9.1.jar:$JARDIR/jzy3d-api-0.9.1.jar:$JARDIR/jogl-all.jar:$JARDIR/gluegen.jar:$JARDIR/gluegen-rt.jar:$JARDIR/misc/opencsv-2.1.jar:$JARDIR/misc/org.convexhull.jar:$JARDIR/misc/swt.jar:$CLASSPATH
 
 LD_LIBRARY_PATH=$SODIR:$LD_LIBRARY_PATH \
     $JAVA_HOME/bin/java $JAVA_OPTS -classpath "$CLASSPATH" yeti.lang.compiler.yeti "$@"
diff -r b946346870ae -r 8c26ccf36416 bin/yc.bat
--- a/bin/yc.bat	Mon Mar 17 15:21:48 2014 +0000
+++ b/bin/yc.bat	Mon Mar 17 15:56:15 2014 +0000
@@ -1,2 +1,2 @@
-java -classpath "may.jar;..\yeti\yeti.jar;ext\jar\jline-2.11-SNAPSHOT.jar;ext\jar\jvamp.jar;ext\jar\yertle.jar;ext\jar\jtransforms-2.4.jar;ext\jar\org.jzy3d-0.9.jar;ext\jar\jogl-all.jar;ext\jar\gluegen.jar;ext\jar\opencsv-2.1.jar;ext\jar\org.convexhull.jar" -Djava.library.path=ext\native\win64 yeti.lang.compiler.yeti "%~1"
+java -classpath "may.jar;..\yeti\yeti.jar;ext\jar\jline-2.11-SNAPSHOT.jar;ext\jar\jvamp.jar;ext\jar\yertle.jar;ext\jar\jtransforms-2.4.jar;ext\jar\jzy3d-swt-0.9.1.jar;ext\jar\jzy3d-api-0.9.1.jar;ext\jar\jogl-all.jar;ext\jar\gluegen.jar;ext\jar\opencsv-2.1.jar;ext\jar\org.convexhull.jar" -Djava.library.path=ext\native\win64 yeti.lang.compiler.yeti "%~1"
 
diff -r b946346870ae -r 8c26ccf36416 build.xml
--- a/build.xml	Mon Mar 17 15:21:48 2014 +0000
+++ b/build.xml	Mon Mar 17 15:56:15 2014 +0000
@@ -2,7 +2,7 @@
 
   <property name="jardir" value="${basedir}/ext/jar"/>
 
-  <property name="extjars" value="${jardir}/jvamp.jar:${jardir}/yertle.jar:${jardir}/jtransforms-2.4.jar:${jardir}/org.jzy3d-0.9.jar:${jardir}/jogl-all.jar:${jardir}/gluegen.jar:${jardir}/gluegen-rt.jar:${jardir}/opencsv-2.1.jar:${jardir}/org.convexhull.jar"/>
+  <property name="extjars" value="${jardir}/jvamp.jar:${jardir}/yertle.jar:${jardir}/jtransforms-2.4.jar:${jardir}/jzy3d-swt-0.9.1.jar:${jardir}/jzy3d-api-0.9.1.jar:${jardir}/jogl-all.jar:${jardir}/gluegen.jar:${jardir}/gluegen-rt.jar:${jardir}/opencsv-2.1.jar:${jardir}/org.convexhull.jar"/>
 
   <condition property="archtag" value="linux32">
     <os family="unix" arch="i386"/>
diff -r b946346870ae -r 8c26ccf36416 src/may/plot.yeti
--- a/src/may/plot.yeti	Mon Mar 17 15:21:48 2014 +0000
+++ b/src/may/plot.yeti	Mon Mar 17 15:56:15 2014 +0000
@@ -19,6 +19,7 @@
 import org.jzy3d.plot3d.primitives.axes: ContourAxeBox;
 import org.jzy3d.contour: DefaultContourColoringPolicy;
 import org.jzy3d.contour: MapperContourPictureGenerator;
+import org.jzy3d.chart.factories.AWTChartComponentFactory;
 
 import javax.imageio: ImageIO;
 
@@ -138,7 +139,7 @@
 plot structures =
    (quality = Quality#Nicest;
     quality#setAnimated(false);
-    chart = new Chart(quality);
+    chart = AWTChartComponentFactory#chart(quality, "awt");
     var j = 0;
     for structures do s:
         colour = distinctColour j;