Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java @ 7914:db1a2b14c32d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change column order in bed differences export.
author Tom Gottfried <tom@intevation.de>
date Wed, 04 Jun 2014 13:06:52 +0200
parents 76b5add4f268
children 931dffefc3dd
comparison
equal deleted inserted replaced
7913:76b5add4f268 7914:db1a2b14c32d
94 double[][] morph1 = yResult.getMorphWidth1Data(); 94 double[][] morph1 = yResult.getMorphWidth1Data();
95 double[][] morph2 = yResult.getMorphWidth2Data(); 95 double[][] morph2 = yResult.getMorphWidth2Data();
96 for (int j = 0; j < kms[0].length; j++) { 96 for (int j = 0; j < kms[0].length; j++) {
97 writer.writeNext(new String[] { 97 writer.writeNext(new String[] {
98 kmf.format(kms[0][j]), 98 kmf.format(kms[0][j]),
99 desc,
99 mf.format(kms[1][j]), 100 mf.format(kms[1][j]),
100 mf.format(morph1[1][j]), 101 mf.format(morph1[1][j]),
101 mf.format(morph2[1][j]), 102 mf.format(morph2[1][j]),
102 desc }); 103 });
103 } 104 }
104 } 105 }
105 else { 106 else {
106 double[][] kms = result.getDifferencesData(); 107 double[][] kms = result.getDifferencesData();
107 String desc = result.getDiffDescription(); 108 String desc = result.getDiffDescription();
108 for (int j = 0; j < kms[0].length; j++) { 109 for (int j = 0; j < kms[0].length; j++) {
109 writer.writeNext(new String[] { 110 writer.writeNext(new String[] {
110 kmf.format(kms[0][j]), 111 kmf.format(kms[0][j]),
112 desc,
111 mf.format(kms[1][j]), 113 mf.format(kms[1][j]),
112 desc }); 114 });
113 } 115 }
114 } 116 }
115 } 117 }
116 } 118 }
117 119
165 logger.debug("writeCSVHeader()"); 167 logger.debug("writeCSVHeader()");
166 168
167 List<String> header = new ArrayList<String>(); 169 List<String> header = new ArrayList<String>();
168 if (results != null) { 170 if (results != null) {
169 header.add(msg(CSV_HEADER_KM, "km")); 171 header.add(msg(CSV_HEADER_KM, "km"));
172 header.add(msg(CSV_HEADER_DIFF_PAIR, "difference pair"));
170 header.add(msg(CSV_HEADER_DIFF, "cm")); 173 header.add(msg(CSV_HEADER_DIFF, "cm"));
171 if (results.length > 0 && 174 if (results.length > 0 &&
172 results[0] instanceof BedDiffYearResult) { 175 results[0] instanceof BedDiffYearResult) {
173 header.add(msg(CSV_HEADER_MORPH1, "morph width minuend [m]")); 176 header.add(msg(CSV_HEADER_MORPH1, "morph width minuend [m]"));
174 header.add(msg(CSV_HEADER_MORPH2, "morph width subtrahend [m]")); 177 header.add(msg(CSV_HEADER_MORPH2, "morph width subtrahend [m]"));
175 } 178 }
176 header.add(msg(CSV_HEADER_DIFF_PAIR, "difference pair"));
177 } 179 }
178 writer.writeNext(header.toArray(new String[header.size()])); 180 writer.writeNext(header.toArray(new String[header.size()]));
179 } 181 }
180 182
181 protected BedDifferenceJRDataSource createJRData() { 183 protected BedDifferenceJRDataSource createJRData() {
http://dive4elements.wald.intevation.org