Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/fixings/FixDeltaWtGenerator.java @ 9360:ddcd52d239cd
Outliers in fixation calculation are now shown within the other 'B' event themes and get a separate symbol (triangle).
Removed old outliers theme.
Also consider showpoints property.
Also consider pointsize property.
| author | gernotbelger |
|---|---|
| date | Wed, 01 Aug 2018 17:13:52 +0200 |
| parents | 13bbc75ed0bc |
| children | 9b8e8fc1f408 |
comparison
equal
deleted
inserted
replaced
| 9359:df6f1b5806f6 | 9360:ddcd52d239cd |
|---|---|
| 23 import org.dive4elements.river.jfree.StyledDomainMarker; | 23 import org.dive4elements.river.jfree.StyledDomainMarker; |
| 24 import org.dive4elements.river.jfree.StyledTimeSeries; | 24 import org.dive4elements.river.jfree.StyledTimeSeries; |
| 25 import org.dive4elements.river.jfree.StyledValueMarker; | 25 import org.dive4elements.river.jfree.StyledValueMarker; |
| 26 import org.dive4elements.river.themes.ThemeDocument; | 26 import org.dive4elements.river.themes.ThemeDocument; |
| 27 | 27 |
| 28 import java.awt.Shape; | |
| 28 import java.io.OutputStream; | 29 import java.io.OutputStream; |
| 29 import java.text.NumberFormat; | 30 import java.text.NumberFormat; |
| 30 import java.util.ArrayList; | 31 import java.util.ArrayList; |
| 31 import java.util.HashMap; | 32 import java.util.HashMap; |
| 32 import java.util.List; | 33 import java.util.List; |
| 324 log.debug("doQWDEventsOut: qwd == null"); | 325 log.debug("doQWDEventsOut: qwd == null"); |
| 325 return; | 326 return; |
| 326 } | 327 } |
| 327 | 328 |
| 328 final ThemeDocument themeInterpolated = FixWQCurveGenerator.configureThemeInterpolated(theme, qwd); | 329 final ThemeDocument themeInterpolated = FixWQCurveGenerator.configureThemeInterpolated(theme, qwd); |
| 329 final String label = FixWQCurveGenerator.buildQWDSeriesLabel(qwd, desc); | 330 final Shape shape = FixWQCurveGenerator.getWQDShape(qwd, themeInterpolated.parsePointWidth()); |
| 330 | 331 final String label = FixWQCurveGenerator.buildQWDSeriesLabel(getContext().getMeta(), qwd, desc); |
| 332 | |
| 331 final Map<Integer, int[]> annoIdxMap = new HashMap<>(); | 333 final Map<Integer, int[]> annoIdxMap = new HashMap<>(); |
| 332 | 334 |
| 333 final long time = uniqueDate(qwd.getDate().getTime()); | 335 final long time = uniqueDate(qwd.getDate().getTime()); |
| 334 final RegularTimePeriod rtp = new FixedMillisecond(time); | 336 final RegularTimePeriod rtp = new FixedMillisecond(time); |
| 335 final double value = qwd.getDeltaW(); | 337 final double value = qwd.getDeltaW(); |
| 336 | 338 |
| 337 final TimeSeries series = new StyledTimeSeries(label, themeInterpolated); | 339 final TimeSeries series = new StyledTimeSeries(label, themeInterpolated, shape); |
| 338 series.addOrUpdate(rtp, value); | 340 series.addOrUpdate(rtp, value); |
| 339 | 341 |
| 340 tsc.addSeries(series); | 342 tsc.addSeries(series); |
| 341 | 343 |
| 342 addAxisDataset(tsc, 0, visible); | 344 addAxisDataset(tsc, 0, visible); |