# HG changeset patch # User gernotbelger # Date 1527861972 -7200 # Node ID 59cf6e6a452db421c3d1d088556816d5796ad74f # Parent f5b55b383ef964cd6fe97be833bdb561cb5836ca pdf export enhancements diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml --- a/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml Tue May 29 18:17:55 2018 +0200 +++ b/artifacts/doc/conf/jasper/templates/sinfo.flowdepth.jrxml Fri Jun 01 16:06:12 2018 +0200 @@ -1,11 +1,11 @@ - + - @@ -118,19 +120,23 @@ - + + + + + - + - + @@ -142,8 +148,8 @@ - - + + @@ -154,7 +160,7 @@ - + @@ -165,7 +171,7 @@ - + diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/pom.xml --- a/artifacts/pom.xml Tue May 29 18:17:55 2018 +0200 +++ b/artifacts/pom.xml Fri Jun 01 16:06:12 2018 +0200 @@ -1,12 +1,10 @@ - + 4.0.0 org.dive4elements.river river-artifacts 1.0-SNAPSHOT jar - river-artifacts http://maven.apache.org @@ -17,13 +15,13 @@ - org.apache.maven.plugins - maven-compiler-plugin - 2.0.2 - - 1.7 - 1.7 - + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.7 + 1.7 + org.apache.maven.plugins @@ -47,27 +45,35 @@ maven-checkstyle-plugin 3.0.0 - ../checkstyle.xml - UTF-8 + ../checkstyle.xml + UTF-8 - - validate - validate - - true - true - - - check - - + + validate + validate + + true + true + + + check + + - + - + + + + roboto.jar + roboto + 0 + system + ${project.basedir}/src/main/resources/roboto.jar + net.sf.ehcache ehcache-core @@ -135,9 +141,9 @@ 1.3.158 - commons-io - commons-io - 2.4 + commons-io + commons-io + 2.4 org.geotools @@ -193,9 +199,9 @@ - jboss-repo2 - JBoss repo2 - http://repository.jboss.org/nexus/content/groups/public/ + jboss-repo2 + JBoss repo2 + http://repository.jboss.org/nexus/content/groups/public/ gt2.repo diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java Tue May 29 18:17:55 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/SInfoResultType.java Fri Jun 01 16:06:12 2018 +0200 @@ -362,7 +362,7 @@ } }; public static final SInfoResultType waterlevelDifference = new SInfoResultType(I18NStrings.UNIT_M, SInfoI18NStrings.CSV_WATERLEVEL_DIFFERENCE_HEADER, - "sinfo.export.pdf.header.waterlevel.difference") { + "sinfo.export.csv.header.waterlevel.difference") { private static final long serialVersionUID = 1L; @Override @@ -377,7 +377,7 @@ } }; public static final SInfoResultType bedHeightDifference = new SInfoResultType(I18NStrings.UNIT_M, SInfoI18NStrings.CSV_MEAN_BED_HEIGHT_DIFFERENCE_HEADER, - "sinfo.export.pdf.header.mean_bed_height.difference") { + "sinfo.export.csv.header.mean_bed_height.difference") { private static final long serialVersionUID = 1L; @Override diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/src/main/resources/messages.properties --- a/artifacts/src/main/resources/messages.properties Tue May 29 18:17:55 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Fri Jun 01 16:06:12 2018 +0200 @@ -1015,10 +1015,8 @@ sinfo.export.csv.header.flowdepth.development = Flie\u00dftiefenentwicklung sinfo.export.pdf.header.flowdepth.development = Flie\u00dftiefen-entwicklung sinfo.export.csv.header.flowdepth.development.per.year = Flie\u00dftiefenent-wicklung pro Jahr -sinfo.export.csv.header.waterlevel.difference = \u0394WSPL -sinfo.export.pdf.header.waterlevel.difference = dWSPL -sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH -sinfo.export.pdf.header.mean_bed_height.difference = dMSH +sinfo.export.csv.header.waterlevel.difference = \u0394WSPL +sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH sinfo.export.csv.header.flowdepth.current = Flie\u00dftiefe h-aktuell sinfo.export.csv.header.flowdepth.historical = Flie\u00dftiefe h-historisch diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/src/main/resources/messages_de.properties --- a/artifacts/src/main/resources/messages_de.properties Tue May 29 18:17:55 2018 +0200 +++ b/artifacts/src/main/resources/messages_de.properties Fri Jun 01 16:06:12 2018 +0200 @@ -1015,10 +1015,8 @@ sinfo.export.pdf.header.flowdepth.development = Flie\u00dftiefen-entwicklung sinfo.export.csv.header.flowdepth.development = Flie\u00dftiefenentwicklung sinfo.export.csv.header.flowdepth.development.per.year = Flie\u00dftiefenent-wicklung pro Jahr -sinfo.export.csv.header.waterlevel.difference = \u0394WSPL -sinfo.export.pdf.header.waterlevel.difference = dWSPL -sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH -sinfo.export.pdf.header.mean_bed_height.difference = dMSH +sinfo.export.csv.header.waterlevel.difference = \u0394WSPL +sinfo.export.csv.header.mean_bed_height.difference = \u0394MSH sinfo.export.csv.header.flowdepth.current = Flie\u00dftiefe h-aktuell sinfo.export.csv.header.flowdepth.historical = Flie\u00dftiefe h-historisch diff -r f5b55b383ef9 -r 59cf6e6a452d artifacts/src/main/resources/roboto.jar Binary file artifacts/src/main/resources/roboto.jar has changed