# HG changeset patch # User Felix Wolfsteller # Date 1315826792 0 # Node ID 588798ef4791561629a1f96d93dc8fd8e56564c1 # Parent 9bdf738abbada8bf7b40f00fd54cefa4a0b94cd8 Cosmetics. flys-artifacts/trunk@2699 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 9bdf738abbad -r 588798ef4791 flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Mon Sep 12 09:06:05 2011 +0000 +++ b/flys-artifacts/ChangeLog Mon Sep 12 11:26:32 2011 +0000 @@ -1,3 +1,11 @@ +2011-09-12 Felix Wolfsteller + + Cosmetics. + + * src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java, + src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java: + Cosmetics. + 2011-09-12 Felix Wolfsteller Added CSV Export for W-Differences. diff -r 9bdf738abbad -r 588798ef4791 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java Mon Sep 12 09:06:05 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WKmsImpl.java Mon Sep 12 11:26:32 2011 +0000 @@ -15,16 +15,19 @@ ws = new TDoubleArrayList(); } + public WKmsImpl(int capacity) { super(""); kms = new TDoubleArrayList(capacity); ws = new TDoubleArrayList(capacity); } + public WKmsImpl(TDoubleArrayList kms, TDoubleArrayList ws) { this(kms, ws, ""); } + public WKmsImpl( TDoubleArrayList kms, TDoubleArrayList ws, @@ -35,19 +38,23 @@ this.ws = ws; } + public void add(double km, double w) { kms.add(km); ws .add(w); } + public double getW(int index) { return ws.getQuick(index); } + public double getKm(int index) { return kms.getQuick(index); } + public int size() { return kms.size(); } diff -r 9bdf738abbad -r 588798ef4791 flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java Mon Sep 12 09:06:05 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/WDifferencesCurveGenerator.java Mon Sep 12 11:26:32 2011 +0000 @@ -13,10 +13,11 @@ import de.intevation.artifactdatabase.state.Facet; import de.intevation.flys.artifacts.FLYSArtifact; - import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.WKms; +import de.intevation.flys.utils.DataUtil; + /** * An OutGenerator that generates w differences curves. @@ -93,25 +94,28 @@ if (wkms == null) { logger.warn("No data to add to WDifferencesChart."); return; + } + + int size = wkms.size(); + XYSeries series = new StyledXYSeries(seriesName, theme); + + if (logger.isDebugEnabled()) { + if (wkms.size() > 0) { + logger.debug("Generate series: " + series.getKey()); + logger.debug("Start km: " + wkms.getKm(0)); + logger.debug("End km: " + wkms.getKm(size-1)); + logger.debug("Values : " + size); + } } - int size = wkms.size(); - XYSeries series = new StyledXYSeries(seriesName, theme); + for (int i = 0; i < size; i++) { + series.add(wkms.getKm(i), wkms.getW(i)); + } - if (logger.isDebugEnabled()) { - if (wkms.size() > 0) { - logger.debug("Generate series: " + series.getKey()); - logger.debug("Start km: " + wkms.getKm(0)); - logger.debug("End km: " + wkms.getKm(size-1)); - logger.debug("Values : " + size); - } - } - - for (int i = 0; i < size; i++) { - series.add(wkms.getKm(i), wkms.getW(i)); - } - - addFirstAxisSeries(series); + addFirstAxisSeries(series); + if (DataUtil.guessWaterIncreasing(wkms)) { + setInverted(true); + } }