Mercurial > dive4elements > river
changeset 3611:a74bdd032cf7
FixA: Changed sector average form point to line in delta W(t) chart.
flys-artifacts/trunk@5240 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Thu, 23 Aug 2012 09:09:51 +0000 |
parents | 66f539df4e8b |
children | f3fc8d49d741 |
files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/default-themes.xml flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java |
diffstat | 3 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu Aug 23 08:49:37 2012 +0000 +++ b/flys-artifacts/ChangeLog Thu Aug 23 09:09:51 2012 +0000 @@ -1,3 +1,14 @@ +2012-08-23 Raimund Renkert <raimund.renkert@intevation.de> + + FixA: Changed sector average form point to line in delta W(t) chart. + + * src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java: + Add data points for sector average and changed time unit for analysis period + from month to day. + + * doc/conf/default-themes.xml: + Changed theme for sector average to color line. + 2012-08-23 Raimund Renkert <raimund.renkert@intevation.de> Issue 716. FixA: Spilt reference and analysis period themes into one theme for each event.
--- a/flys-artifacts/doc/conf/default-themes.xml Thu Aug 23 08:49:37 2012 +0000 +++ b/flys-artifacts/doc/conf/default-themes.xml Thu Aug 23 09:09:51 2012 +0000 @@ -1259,53 +1259,45 @@ <theme name="FixingDeltaWtAverage0"> <inherits> - <inherit from="ColorPoints" /> + <inherit from="ColorLines" /> </inherits> <fields> <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h" /> - <field name="pointsize" type="int" display="Punktdicke" - default="3" /> - <field name="pointcolor" type="Color" display="Punktfarbe" + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 128, 0" /> </fields> </theme> <theme name="FixingDeltaWtAverage1"> <inherits> - <inherit from="ColorPoints" /> + <inherit from="ColorLines" /> </inherits> <fields> <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h" /> - <field name="pointsize" type="int" display="Punktdicke" - default="3" /> - <field name="pointcolor" type="Color" display="Punktfarbe" + <field name="linecolor" type="Color" display="Linienfarbe" default="0, 0, 255" /> </fields> </theme> <theme name="FixingDeltaWtAverage2"> <inherits> - <inherit from="ColorPoints" /> + <inherit from="ColorLines" /> </inherits> <fields> <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h" /> - <field name="pointsize" type="int" display="Punktdicke" - default="3" /> - <field name="pointcolor" type="Color" display="Punktfarbe" + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 255" /> </fields> </theme> <theme name="FixingDeltaWtAverage3"> <inherits> - <inherit from="ColorPoints" /> + <inherit from="ColorLines" /> </inherits> <fields> <field name="showlinelabel" type="boolean" display="Beschriftung anzeigen" default="false" hints="h" /> - <field name="pointsize" type="int" display="Punktdicke" - default="3" /> - <field name="pointcolor" type="Color" display="Punktfarbe" + <field name="linecolor" type="Color" display="Linienfarbe" default="255, 0, 0" /> </fields> </theme>
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Thu Aug 23 08:49:37 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixDeltaWtGenerator.java Thu Aug 23 09:09:51 2012 +0000 @@ -31,7 +31,6 @@ import org.apache.log4j.Logger; import org.jfree.chart.annotations.XYTextAnnotation; import org.jfree.data.time.Day; -import org.jfree.data.time.Month; import org.jfree.data.time.RegularTimePeriod; import org.jfree.data.time.TimeSeries; import org.jfree.data.time.TimeSeriesCollection; @@ -228,19 +227,17 @@ } 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); + series.addOrUpdate(rtp, value); rtp = new Day(qwd.dateRange.getTo()); - series.add(rtp, value); - */ + series.addOrUpdate(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, qwd.qwd, theme, visible); @@ -390,8 +387,8 @@ } for (int i = 0; i < ranges.length; i++) { logger.debug("creating domain marker"); - RegularTimePeriod start = new Month(ranges[i].getFrom()); - RegularTimePeriod end = new Month(ranges[i].getTo()); + RegularTimePeriod start = new Day(ranges[i].getFrom()); + RegularTimePeriod end = new Day(ranges[i].getTo()); StyledDomainMarker marker = new StyledDomainMarker(start.getMiddleMillisecond(), end.getMiddleMillisecond(), theme);