# HG changeset patch # User Christian Lins # Date 1349011967 -7200 # Node ID 090fea205d1d74e84612a0ec5b4dfd806428e76c # Parent b328da465fe948da3ca5a648ef25a712e722e656 Fixing Delta W/t chart: reference period area can now switched to invisible (#877) diff -r b328da465fe9 -r 090fea205d1d flys-artifacts/ChangeLog --- a/flys-artifacts/ChangeLog Sun Sep 30 15:12:39 2012 +0200 +++ b/flys-artifacts/ChangeLog Sun Sep 30 15:32:47 2012 +0200 @@ -1,9 +1,14 @@ 2012-09-30 Christian Lins - * flys-artifacts/src/main/resources/messages.properties, - flys-artifacts/src/main/resources/messages_de.properties, - flys-artifacts/src/main/resources/messages_de_DE.properties, - flys-artifacts/src/main/resources/messages_en.properties: + * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: + Fixing Delta W/t chart: reference period area can now switched to invisible (#877). + +2012-09-30 Christian Lins + + * src/main/resources/messages.properties, + src/main/resources/messages_de.properties, + src/main/resources/messages_de_DE.properties, + src/main/resources/messages_en.properties: Correct i18n for fixation outlier widget (state.fixation.preprocess) (#873). 2012-09-30 Sascha L. Teichmann @@ -28,8 +33,8 @@ 2012-09-29 Christian Lins - * flys-artifacts/doc/conf/themes.xml, - flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: + * doc/conf/themes.xml, + src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java: Manual Points working in Fixing Delta W/t chart (#462). 2012-09-29 Sascha L. Teichmann diff -r b328da465fe9 -r 090fea205d1d flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Sun Sep 30 15:12:39 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Sun Sep 30 15:32:47 2012 +0200 @@ -1,5 +1,22 @@ package de.intevation.flys.exports.fixings; +import de.intevation.artifactdatabase.state.ArtifactAndFacet; +import de.intevation.artifacts.CallContext; +import de.intevation.flys.artifacts.FLYSArtifact; +import de.intevation.flys.artifacts.access.FixAnalysisAccess; +import de.intevation.flys.artifacts.model.DateRange; +import de.intevation.flys.artifacts.model.FacetTypes; +import de.intevation.flys.artifacts.model.QWDDateRange; +import de.intevation.flys.artifacts.model.fixings.QWD; +import de.intevation.flys.artifacts.resources.Resources; +import de.intevation.flys.exports.TimeseriesChartGenerator; +import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation; +import de.intevation.flys.jfree.FLYSAnnotation; +import de.intevation.flys.jfree.StyledDomainMarker; +import de.intevation.flys.jfree.StyledTimeSeries; +import de.intevation.flys.jfree.StyledValueMarker; +import de.intevation.flys.utils.ThemeUtil; + import java.io.OutputStream; import java.text.NumberFormat; import java.util.ArrayList; @@ -17,23 +34,6 @@ import org.jfree.data.time.TimeSeriesCollection; import org.w3c.dom.Document; -import de.intevation.artifactdatabase.state.ArtifactAndFacet; -import de.intevation.artifacts.CallContext; -import de.intevation.flys.artifacts.FLYSArtifact; -import de.intevation.flys.artifacts.access.FixAnalysisAccess; -import de.intevation.flys.artifacts.model.DateRange; -import de.intevation.flys.artifacts.model.FacetTypes; -import de.intevation.flys.artifacts.model.QWDDateRange; -import de.intevation.flys.artifacts.model.fixings.QWD; -import de.intevation.flys.artifacts.resources.Resources; -import de.intevation.flys.exports.TimeseriesChartGenerator; -import de.intevation.flys.jfree.CollisionFreeXYTextAnnotation; -import de.intevation.flys.jfree.FLYSAnnotation; -import de.intevation.flys.jfree.StyledDomainMarker; -import de.intevation.flys.jfree.StyledTimeSeries; -import de.intevation.flys.jfree.StyledValueMarker; -import de.intevation.flys.utils.ThemeUtil; - /** * Generator for Delta W(t) charts. @@ -226,16 +226,18 @@ { logger.debug("doReferencePeriodsOut()"); - FixAnalysisAccess access = new FixAnalysisAccess(artifact); - DateRange refRange = access.getReferencePeriod(); + if (visible) { + FixAnalysisAccess access = new FixAnalysisAccess(artifact); + DateRange refRange = access.getReferencePeriod(); - RegularTimePeriod start = new Day(refRange.getFrom()); - RegularTimePeriod end = new Day(refRange.getTo()); - StyledDomainMarker marker = new StyledDomainMarker( - start.getMiddleMillisecond(), - end.getMiddleMillisecond(), - theme); - domainMarker.add(marker); + RegularTimePeriod start = new Day(refRange.getFrom()); + RegularTimePeriod end = new Day(refRange.getTo()); + StyledDomainMarker marker = new StyledDomainMarker( + start.getMiddleMillisecond(), + end.getMiddleMillisecond(), + theme); + domainMarker.add(marker); + } }