Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java @ 3467:b9c2becbcc9e
Towards issue745 (lines for averages in deltawt).
flys-artifacts/trunk@5139 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 26 Jul 2012 14:12:38 +0000 |
parents | b9aff8d6ff74 |
children | f7e6b35f0b5c |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Thu Jul 26 11:47:04 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Thu Jul 26 14:12:38 2012 +0000 @@ -8,6 +8,7 @@ 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; @@ -46,6 +47,7 @@ extends TimeseriesChartGenerator implements FacetTypes { + /** Private logger. */ private static Logger logger = Logger.getLogger(FixDeltaWtGenerator.class); @@ -217,23 +219,31 @@ { logger.debug("doSectorAverageOut(): description = " + desc); - QWD qwd = (QWD) data; + QWDDateRange qwd = (QWDDateRange) data; TimeSeriesCollection tsc = new TimeSeriesCollection(); TimeSeries series = new StyledTimeSeries(desc, theme); - if (qwd == null) { + if (qwd == null || qwd.qwd == null || qwd.dateRange == null) { return; } - RegularTimePeriod rtp = new Day(qwd.getDate()); - double value = qwd.getDeltaW(); + RegularTimePeriod rtp = new Day(qwd.qwd.getDate()); + double value = qwd.qwd.getDeltaW(); + /* + // Draw a line spanning the analysis time. series.add(rtp, value); + rtp = new Day(qwd.dateRange.getFrom()); + series.add(rtp, value); + rtp = new Day(qwd.dateRange.getTo()); + series.add(rtp, value); + */ + tsc.addSeries(series); addAxisDataset(tsc, 0, visible); addAttribute(desc, "outline"); Map<Integer, int[]> annoIdxMap = new HashMap<Integer, int[]>(); annoIdxMap.put (0, new int[]{0,0}); - doQWDTextAnnotations(annoIdxMap, tsc, new QWD[]{qwd}, theme, visible); + doQWDTextAnnotations(annoIdxMap, tsc, new QWD[]{qwd.qwd}, theme, visible); }