Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java @ 8422:96bf5135cd0e
Bedheight differences exports sounding width and data gap for minuend and subtrahend.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 17 Oct 2014 13:34:08 +0200 |
| parents | 8a14605fb64a |
| children | 322ac5d61777 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Fri Oct 17 13:17:12 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java Fri Oct 17 13:34:08 2014 +0200 @@ -67,6 +67,18 @@ "export.minfo.beddifference.morph2"; */ + private static final String CSV_HEADER_SOUNDING1 = + "export.minfo.beddifference.sounding1"; + + private static final String CSV_HEADER_SOUNDING2 = + "export.minfo.beddifference.sounding2"; + + private static final String CSV_HEADER_GAP1 = + "export.minfo.beddifference.gap1"; + + private static final String CSV_HEADER_GAP2 = + "export.minfo.beddifference.gap2"; + public static final String JASPER_FILE = "export.minfo.beddifference.pdf.file"; @@ -93,6 +105,10 @@ BedDiffYearResult yResult = (BedDiffYearResult) result; String desc = result.getDiffDescription(); double[][] kms = yResult.getDifferencesData(); + double[][] sounding1 = yResult.getSoundingWidth1Data(); + double[][] sounding2 = yResult.getSoundingWidth2Data(); + double[][] gap1 = yResult.getDataGap1Data(); + double[][] gap2 = yResult.getDataGap2Data(); //double[][] morph1 = yResult.getMorphWidth1Data(); //double[][] morph2 = yResult.getMorphWidth2Data(); for (int j = 0; j < kms[0].length; j++) { @@ -100,6 +116,10 @@ kmf.format(kms[0][j]), desc, mf.format(kms[1][j]), + mf.format(sounding1[1][j]), + mf.format(sounding2[1][j]), + mf.format(gap1[1][j]), + mf.format(gap2[1][j]) //mf.format(morph1[1][j]), //mf.format(morph2[1][j]), }); @@ -184,8 +204,10 @@ /* 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]")); + header.add(msg(CSV_HEADER_SOUNDING1, "soundung width minuend [m]")); + header.add(msg(CSV_HEADER_SOUNDING2, "sounding width subtrahend [m]")); + header.add(msg(CSV_HEADER_GAP1, "data gap minuend")); + header.add(msg(CSV_HEADER_GAP2, "data gap subtrahend")); } */ } @@ -202,6 +224,10 @@ BedDiffYearResult yResult = (BedDiffYearResult) result; double[][] kms = result.getDifferencesData(); String desc = result.getDiffDescription(); + double[][] sounding1 = yResult.getSoundingWidth1Data(); + double[][] sounding2 = yResult.getSoundingWidth2Data(); + double[][] gap1 = yResult.getDataGap1Data(); + double[][] gap2 = yResult.getDataGap2Data(); //double[][] morph1 = yResult.getMorphWidth1Data(); //double[][] morph2 = yResult.getMorphWidth2Data(); for (int j = 0; j < kms[0].length; j++) { @@ -209,6 +235,10 @@ kmf.format(kms[0][j]), desc, mf.format(kms[1][j]), + mf.format(sounding1[1][j]), + mf.format(sounding2[1][j]), + mf.format(gap1[1][j]), + mf.format(gap2[1][j]) //mf.format(morph1[1][j]), //mf.format(morph2[1][j]) });