# HG changeset patch # User Sascha L. Teichmann # Date 1309167741 0 # Node ID f959faaa7c4a4af4ab1d2a03bd19067b4efad58c # Parent b385577bcaca88a720f3b794339756dd90c40779 Fix for flys/issue150: Invert the x axis if its guessed that water is increasing. flys-artifacts/trunk@2247 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r b385577bcaca -r f959faaa7c4a flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Mon Jun 27 09:17:41 2011 +0000 +++ b/flys-artifacts/ChangeLog Mon Jun 27 09:42:21 2011 +0000 @@ -1,3 +1,11 @@ +2011-06-27 Sascha L. Teichmann + + Fix for flys/issue150 + + * src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java, + src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java: + Invert the x axis if its guessed that water is increasing. + 2011-06-27 Sascha L. Teichmann * src/main/java/de/intevation/flys/artifacts/model/WQ.java(guessWaterIncreasing): diff -r b385577bcaca -r f959faaa7c4a flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java Mon Jun 27 09:17:41 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeLongitudinalSectionGenerator.java Mon Jun 27 09:42:21 2011 +0000 @@ -137,6 +137,10 @@ } cw.addSeries(series); } + + if (wqckms.guessWaterIncreasing()) { + setInverted(true); + } } diff -r b385577bcaca -r f959faaa7c4a flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Mon Jun 27 09:17:41 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/LongitudinalSectionGenerator.java Mon Jun 27 09:42:21 2011 +0000 @@ -20,8 +20,6 @@ import de.intevation.artifactdatabase.state.Facet; -import de.intevation.flys.model.River; - import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.model.FacetTypes; @@ -67,6 +65,8 @@ /** The storage for the Q series to be drawn in this chart.*/ protected XYSeriesCollection q; + protected boolean inverted; + public LongitudinalSectionGenerator() { super(); @@ -80,6 +80,13 @@ return msg(I18N_CHART_TITLE, I18N_CHART_TITLE_DEFAULT); } + public boolean isInverted() { + return inverted; + } + + public void setInverted(boolean inverted) { + this.inverted = inverted; + } @Override protected void addSubtitles(JFreeChart chart) { @@ -182,13 +189,9 @@ * @param xaxis The domain axis. */ protected void invertXAxis(ValueAxis xaxis) { - FLYSArtifact artifact = (FLYSArtifact) master; - River river = artifact.getRiver(); - boolean up = river.getKmUp(); - - if (up) { - logger.info("Invert X-Axis."); + if (inverted) { + logger.debug("Invert X-Axis."); xaxis.setInverted(true); } } @@ -250,6 +253,10 @@ } w.addSeries(series); + + if (wqkms.guessWaterIncreasing()) { + setInverted(true); + } } @@ -279,6 +286,10 @@ } q.addSeries(series); + + if (wqkms.guessWaterIncreasing()) { + setInverted(true); + } }