Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java @ 8420:8a14605fb64a
Removed morpho width from bed height diffs.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Fri, 17 Oct 2014 12:50:35 +0200 |
parents | e4606eae8ea5 |
children | 96bf5135cd0e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Fri Oct 17 11:44:01 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Fri Oct 17 12:50:35 2014 +0200 @@ -59,11 +59,13 @@ private static final String CSV_HEADER_DIFF_PAIR = "export.minfo.beddifference.diff.pair"; + /* private static final String CSV_HEADER_MORPH1 = "export.minfo.beddifference.morph1"; private static final String CSV_HEADER_MORPH2 = "export.minfo.beddifference.morph2"; + */ public static final String JASPER_FILE = "export.minfo.beddifference.pdf.file"; @@ -91,15 +93,15 @@ BedDiffYearResult yResult = (BedDiffYearResult) result; String desc = result.getDiffDescription(); double[][] kms = yResult.getDifferencesData(); - double[][] morph1 = yResult.getMorphWidth1Data(); - double[][] morph2 = yResult.getMorphWidth2Data(); + //double[][] morph1 = yResult.getMorphWidth1Data(); + //double[][] morph2 = yResult.getMorphWidth2Data(); for (int j = 0; j < kms[0].length; j++) { writer.writeNext(new String[] { kmf.format(kms[0][j]), desc, mf.format(kms[1][j]), - mf.format(morph1[1][j]), - mf.format(morph2[1][j]), + //mf.format(morph1[1][j]), + //mf.format(morph2[1][j]), }); } } @@ -162,10 +164,12 @@ source.addMetaData("diffpairheader", msg(CSV_HEADER_DIFF_PAIR, "Difference pair")); source.addMetaData("diffheader", msg(CSV_HEADER_DIFF, "cm")); + /* source.addMetaData("morph1header", msg(CSV_HEADER_MORPH1, "Morph. active width minuend")); source.addMetaData("morph2header", msg(CSV_HEADER_MORPH2, "Morph. active width subtrahend")); + */ } @@ -177,11 +181,13 @@ header.add(msg(CSV_HEADER_KM, "km")); header.add(msg(CSV_HEADER_DIFF_PAIR, "difference pair")); header.add(msg(CSV_HEADER_DIFF, "cm")); + /* if (results.length > 0 && results[0] instanceof BedDiffYearResult) { header.add(msg(CSV_HEADER_MORPH1, "morph width minuend [m]")); header.add(msg(CSV_HEADER_MORPH2, "morph width subtrahend [m]")); } + */ } writer.writeNext(header.toArray(new String[header.size()])); } @@ -196,15 +202,15 @@ BedDiffYearResult yResult = (BedDiffYearResult) result; double[][] kms = result.getDifferencesData(); String desc = result.getDiffDescription(); - double[][] morph1 = yResult.getMorphWidth1Data(); - double[][] morph2 = yResult.getMorphWidth2Data(); + //double[][] morph1 = yResult.getMorphWidth1Data(); + //double[][] morph2 = yResult.getMorphWidth2Data(); for (int j = 0; j < kms[0].length; j++) { source.addData(new String[] { kmf.format(kms[0][j]), desc, mf.format(kms[1][j]), - mf.format(morph1[1][j]), - mf.format(morph2[1][j]) + //mf.format(morph1[1][j]), + //mf.format(morph2[1][j]) }); } }