diff --git a/.gitignore b/.gitignore index ba8eaf60..1c268892 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ doc/ data/splendor-big.png src/de/fhpotsdam/unfolding/mapdisplay/GLGraphicsMapDisplayTransparentTest.java /bin/ +/target/ \ No newline at end of file diff --git a/README.md b/README.md index 3aa68db4..50a577ad 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,25 @@ Create interactive thematic maps and geovisualizations. * * +Compilation : + +``` bash +mvn install +mvn javadoc:javadoc +sh createLibrary.sh +``` + +Updated version for Processing 3. + +Compilation : + +``` bash +mvn install +mvn javadoc:javadoc +sh createLibrary.sh +``` + + ## About ### Interaction Events Unfolding enables you to rapidly create interactive maps. Basic interactions @@ -54,5 +73,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - diff --git a/createLibrary.sh b/createLibrary.sh new file mode 100644 index 00000000..8bd66e44 --- /dev/null +++ b/createLibrary.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +TMP=tmp +NAME=Unfolding + +mkdir $TMP +mkdir $TMP/$NAME +mkdir $TMP/$NAME/library +mkdir $TMP/$NAME/reference + +echo "Copy Library" +# Library +cp target/$NAME.jar $TMP/$NAME/library/$NAME.jar + + +echo "Copy the sources" +# copy the source also +cp -R src $TMP/$NAME/ +cp -R data $TMP/$NAME/ +cp -R lib-processing/* $TMP/$NAME/library/ + +cp -R test $TMP/$NAME/ +# cp -R data $TMP/$NAME/ + +# Not really an external library. It is here until +# Processing is in Maven Central. +#rm $TMP/$NAME/lib/core.jar + +echo "Copy the examples" +cp -R examples $TMP/$NAME/ + +cp -R pom.xml $TMP/$NAME/ + +echo "Copy the JavaDoc" +cp -R target/site/apidocs/* $TMP/$NAME/reference/ + +echo "Create the archive..." +cd $TMP + +tar -zcf $NAME.tgz $NAME + +mv $NAME.tgz .. +cd .. + +echo "Clean " +rm -rf $TMP + + +echo "Creation OK" diff --git a/lib-processing/json4processing.jar b/lib-processing/json4processing.jar new file mode 100644 index 00000000..6c3073ef Binary files /dev/null and b/lib-processing/json4processing.jar differ diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..cbf7e5c2 --- /dev/null +++ b/pom.xml @@ -0,0 +1,186 @@ + + 4.0.0 + fr.inria + unfolding + 1.0 + jar + unfolding + + + src + test + + + + org.codehaus.mojo + build-helper-maven-plugin + + + generate-sources + + add-source + + + + examples + examples-extern + + + + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.2 + + Unfolding + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.3.2 + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.10.1 + + -Xdoclint:none + + + + + + + + + + org.processing + core + 3.0 + + + + + gluegen-rt + gluegen-rt + 3.0 + system + ${project.basedir}/lib/gluegen-rt.jar + + + jogl-all + jogl-all + 3.0 + system + ${project.basedir}/lib/jogl-all.jar + + + + json4processing + json4processing + 1.0 + system + ${project.basedir}/lib/json4processing.jar + + + + sqlite-jdbc + sqlite-jdbc + 1.0 + system + ${project.basedir}/lib/sqlite-jdbc-3.7.2.jar + + + log4j + log4j + 1.0 + system + ${project.basedir}/lib-processing/log4j-1.2.15.jar + + + + libTUIO + libTUIO + 1.0 + system + ${project.basedir}/lib/libTUIO.jar + + + + org.processing + core + 3.0 + + + + junit + junit + 4.10 + test + + + + handy + handy + 1.0 + system + ${project.basedir}/lib-extern/handy.jar + + + ani + ani + 1.0 + system + ${project.basedir}/lib-extern/Ani.jar + + + geonames + geonames + 1.0 + system + ${project.basedir}/lib-extern/geonames-1.1.6.jar + + + controlP5 + controlP5 + 1.0 + system + ${project.basedir}/lib-extern/controlP5.jar + + + joda-time + joda-time + 2.0 + system + ${project.basedir}/lib-extern/joda-time-2.0.jar + + + + + license + + diff --git a/src/de/fhpotsdam/unfolding/interactions/TuioCursorHandler.java b/src/de/fhpotsdam/unfolding/interactions/TuioCursorHandler.java index 16a72d5e..52112274 100644 --- a/src/de/fhpotsdam/unfolding/interactions/TuioCursorHandler.java +++ b/src/de/fhpotsdam/unfolding/interactions/TuioCursorHandler.java @@ -63,7 +63,7 @@ public TuioCursorHandler(PApplet p, boolean listenToTuio, List map } tuioClient.connect(); - p.registerDispose(this); + p.registerMethod("dispose", this); } public TuioCursorHandler(PApplet p, List maps) { diff --git a/src/de/fhpotsdam/unfolding/mapdisplay/OpenGLMapDisplay.java b/src/de/fhpotsdam/unfolding/mapdisplay/OpenGLMapDisplay.java index 1ab6ae48..5eed1885 100644 --- a/src/de/fhpotsdam/unfolding/mapdisplay/OpenGLMapDisplay.java +++ b/src/de/fhpotsdam/unfolding/mapdisplay/OpenGLMapDisplay.java @@ -50,9 +50,9 @@ public OpenGLMapDisplay(PApplet papplet, AbstractMapProvider provider, String re } offscreenPG = papplet.createGraphics((int) width, (int) height, this.renderer); - offscreenPG.smooth(papplet.g.quality); + offscreenPG.smooth(papplet.g.smooth); offscreenCutoffPG = papplet.createGraphics((int) width, (int) height, this.renderer); - offscreenCutoffPG.smooth(papplet.g.quality); + offscreenCutoffPG.smooth(papplet.g.smooth); } public void setMapDisplayShader(MapDisplayShader shader) { @@ -79,9 +79,9 @@ public void resize(float width, float height) { } offscreenPG = papplet.createGraphics((int) width, (int) height, renderer); - offscreenPG.smooth(papplet.g.quality); + offscreenPG.smooth(papplet.g.smooth); offscreenCutoffPG = papplet.createGraphics((int) width, (int) height, renderer); - offscreenCutoffPG.smooth(papplet.g.quality); + offscreenCutoffPG.smooth(papplet.g.smooth); if (mapDisplayShader != null) { mapDisplayShader.resize(width, height); diff --git a/test/de/fhpotsdam/AbstractShapeMarkerLocationTest.java b/test/de/fhpotsdam/AbstractShapeMarkerLocationTest.java index 214691f0..77d6899d 100644 --- a/test/de/fhpotsdam/AbstractShapeMarkerLocationTest.java +++ b/test/de/fhpotsdam/AbstractShapeMarkerLocationTest.java @@ -33,7 +33,8 @@ public void before() { } private void addCountryMarker() { - List countries = GeoJSONReader.loadData(p, "data/countries.geo.json"); +// System.out.println("Sketch Path " + p.sketchPath()); + List countries = GeoJSONReader.loadData(p, p.sketchPath() +"/data/data/countries.geo.json"); List countryMarkers = MapUtils.createSimpleMarkers(countries); map.addMarkers(countryMarkers); } diff --git a/test/de/fhpotsdam/ImageLoadingTestApp.java b/test/de/fhpotsdam/ImageLoadingTestApp.java index 3d13c43f..ca48a7f2 100644 --- a/test/de/fhpotsdam/ImageLoadingTestApp.java +++ b/test/de/fhpotsdam/ImageLoadingTestApp.java @@ -31,7 +31,7 @@ public void setup() { if (bytes == null) { } else { Image awtImage = Toolkit.getDefaultToolkit().createImage(bytes); - MediaTracker tracker = new MediaTracker(this); + MediaTracker tracker = new MediaTracker(this.frame); tracker.addImage(awtImage, 0); try { tracker.waitForAll(); diff --git a/test/de/fhpotsdam/transmatrix/MultiTransObjectApp.java b/test/de/fhpotsdam/transmatrix/MultiTransObjectApp.java index abc34d24..52c3c025 100644 --- a/test/de/fhpotsdam/transmatrix/MultiTransObjectApp.java +++ b/test/de/fhpotsdam/transmatrix/MultiTransObjectApp.java @@ -40,7 +40,7 @@ public void setup() { transObjects.add(new TuioTransformableObject(this, 500, 200, 300, 300)); transObjects.add(new TextThing(this, 600, 50, 340, 70)); - addMouseWheelListener(new java.awt.event.MouseWheelListener() { + frame.addMouseWheelListener(new java.awt.event.MouseWheelListener() { public void mouseWheelMoved(java.awt.event.MouseWheelEvent evt) { mouseWheel(evt.getWheelRotation()); } diff --git a/test/de/fhpotsdam/unfolding/interaction/ManualMapInteractionsTestApp.java b/test/de/fhpotsdam/unfolding/interaction/ManualMapInteractionsTestApp.java index 76cea1b7..c9a797d0 100644 --- a/test/de/fhpotsdam/unfolding/interaction/ManualMapInteractionsTestApp.java +++ b/test/de/fhpotsdam/unfolding/interaction/ManualMapInteractionsTestApp.java @@ -37,7 +37,7 @@ public void setup() { debugDisplay = new DebugDisplay(this, map, 0, 0); - addMouseWheelListener(new java.awt.event.MouseWheelListener() { + frame.addMouseWheelListener(new java.awt.event.MouseWheelListener() { public void mouseWheelMoved(java.awt.event.MouseWheelEvent evt) { mouseWheel(evt.getWheelRotation()); }