Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java @ 6759:6eb2b8087cfa
issue1416: exporter for sedimentload and i18n.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Tue, 06 Aug 2013 16:56:45 +0200 |
parents | 09e70f01ed1e |
children | aa1d681ee6eb |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java Tue Aug 06 16:39:41 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java Tue Aug 06 16:56:45 2013 +0200 @@ -35,7 +35,8 @@ import au.com.bytecode.opencsv.CSVWriter; -/** Do CSV export for sediment load calculations (will also be shown in +/** + * Do CSV export for sediment load calculations (will also be shown in * client). */ public class SedimentLoadExporter extends AbstractExporter @@ -62,6 +63,9 @@ public static final String CSV_SUSP_SAND = "export.sedimentload_ls.csv.header.suspsand"; + public static final String CSV_SUSP_SAND_BB = + "export.sedimentload_ls.csv.header.suspsandbb"; + public static final String CSV_SUSP_SEDIMENT = "export.sedimentload_ls.csv.header.suspsediment"; @@ -109,13 +113,13 @@ writer.writeNext(new String[] { kmf.format(km), years, - valf.format(fraction.getTotal()), + valf.format(fraction.getSuspSediment()), + valf.format(fraction.getSuspSand()), + valf.format(fraction.getSuspSandBed()), valf.format(fraction.getSand()), valf.format(fraction.getFineMiddle()), valf.format(fraction.getCoarse()), - valf.format(fraction.getSuspSand()), - //valf.format(fraction.getSuspSandBed()), - valf.format(fraction.getSuspSediment()) + valf.format(fraction.getTotal()) }); } @@ -125,15 +129,15 @@ List<String> header = new LinkedList<String>(); if (results != null) { - header.add(msg(CSV_KM, "km")); - header.add(msg(CSV_YEAR, "Jahr")); - header.add(msg(CSV_TOTAL, "Gesamt")); - header.add(msg(CSV_SAND, "Sand")); - header.add(msg(CSV_FINEMIDDLE,"Fein")); - header.add(msg(CSV_COARSE, "Grob")); - header.add(msg(CSV_SUSP_SAND, "Su.Sand")); + header.add(msg(CSV_KM, "km")); + header.add(msg(CSV_YEAR, "Jahr")); header.add(msg(CSV_SUSP_SEDIMENT, "Schwebst.")); - //header.add("Susp.Sand Bett"); + header.add(msg(CSV_SUSP_SAND, "Susp.Sand")); + header.add(msg(CSV_SUSP_SAND_BB, "Susp.Sand(BB)")); + header.add(msg(CSV_SAND, "Sand")); + header.add(msg(CSV_FINEMIDDLE, "Kies(f+m)")); + header.add(msg(CSV_COARSE, "Kies(g)")); + header.add(msg(CSV_TOTAL, "Gesamt")); } writer.writeNext(header.toArray(new String[header.size()])); }