[PATCH 4 of 6] Add official Fixings to PDF Export
Wald Commits
scm-commit at wald.intevation.org
Thu Jul 18 17:54:04 CEST 2013
# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1374155688 -7200
# Node ID 3d23f606512f5617af88a541efab1335772a0cbd
# Parent 85ff19b94ec53ca867f27c74da3ebf0ed4c44f8b
Add official Fixings to PDF Export
diff -r 85ff19b94ec5 -r 3d23f606512f artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java Thu Jul 18 15:54:23 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/WaterlevelExporter.java Thu Jul 18 15:54:48 2013 +0200
@@ -861,12 +861,38 @@
boolean atGauge = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.WGAUGE;
boolean isQ = mode == WQ_MODE.QGAUGE || mode == WQ_MODE.QFREE;
+ Double first = Double.NaN;
+ Double last = Double.NaN;
+
addMetaData(source);
for (WQKms[] tmp: data) {
for (WQKms wqkms: tmp) {
addWKmsData(wqkms, atGauge, isQ, source);
+ double[] firstLast = wqkms.getFirstLastKM();
+ if (first.isNaN()) {
+ /* Initialize */
+ first = firstLast[0];
+ last = firstLast[1];
+ }
+ if (firstLast[0] > firstLast[1]) {
+ /* Calculating upstream we assert that it is
+ * impossible that the direction changes during this
+ * loop */
+ first = Math.max(first, firstLast[0]);
+ last = Math.min(last, firstLast[1]);
+ } else if (firstLast[0] < firstLast[1]) {
+ first = Math.min(first, firstLast[0]);
+ last = Math.max(last, firstLast[1]);
+ } else {
+ first = last = firstLast[0];
+ }
}
}
+
+ /* Append the official fixing at the bottom */
+ for (WQKms wqkms: officalFixings) {
+ addWKmsData(filterWQKms(wqkms, first, last), atGauge, isQ, source);
+ }
return source;
}
More information about the Dive4elements-commits
mailing list