Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java @ 7915:931dffefc3dd
flys/issue1628: Adjusted the PDF export.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Wed, 04 Jun 2014 15:34:22 +0200 |
parents | db1a2b14c32d |
children | c0843a658474 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Wed Jun 04 13:06:52 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Wed Jun 04 15:34:22 2014 +0200 @@ -30,6 +30,7 @@ import org.dive4elements.artifacts.CallMeta; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.BedDifferencesAccess; +import org.dive4elements.river.artifacts.access.RiverAccess; import org.dive4elements.artifacts.common.utils.Config; import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.model.CalculationResult; @@ -38,7 +39,6 @@ import org.dive4elements.river.artifacts.model.minfo.BedDifferenceJRDataSource; import org.dive4elements.river.exports.AbstractExporter; import org.dive4elements.river.utils.Formatter; -import org.dive4elements.river.utils.RiverUtils; import au.com.bytecode.opencsv.CSVWriter; @@ -137,7 +137,8 @@ D4EArtifact arti = (D4EArtifact) master; - source.addMetaData ("river", RiverUtils.getRivername(arti)); + //source.addMetaData ("river", RiverUtils.getRivername(arti)); + source.addMetaData ("river", new RiverAccess(arti).getRiverName()); Locale locale = Resources.getLocale(meta); DateFormat df = DateFormat.getDateInstance(DateFormat.SHORT, locale); @@ -160,6 +161,8 @@ access.getDifferenceArtifactNamePairs(), "\n")); source.addMetaData("unit", msg(CSV_HEADER_DIFF, "cm")); + source.addMetaData("diffpairheader", + msg(CSV_HEADER_DIFF_PAIR, "Difference pair")); } @@ -188,9 +191,12 @@ NumberFormat mf = Formatter.getMeterFormat(context); for (BedDifferencesResult result: results) { double[][] kms = result.getDifferencesData(); + String desc = result.getDiffDescription(); for (int j = 0; j < kms[0].length; j++) { source.addData(new String[] { - kmf.format(kms[0][j]), mf.format(kms[1][j])}); + kmf.format(kms[0][j]), + mf.format(kms[1][j]), + desc }); } } return source; @@ -208,7 +214,7 @@ String confPath = Config.getConfigDirectory().toString(); - Map parameters = new HashMap(); + Map<String, Object> parameters = new HashMap<String, Object>(); parameters.put("ReportTitle", Resources.getMsg( context.getMeta(), PDF_TITLE, "Exported Data")); try {