Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java @ 8455:6dfc3a1fc70d
(issue1764) Set upper-time and lower-time for time series axes
This introduces new optional chart settings. Upper-time and
lower-time. If they are present the client can show a date selection
and they can be used for the domain axis in timeseries diagrams.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 29 Oct 2014 19:51:39 +0100 |
| parents | 31272d799dad |
| children | 5e38e2924c07 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java Wed Oct 29 19:49:18 2014 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator.java Wed Oct 29 19:51:39 2014 +0100 @@ -952,8 +952,20 @@ Boolean fixed = as.isFixed(); + if (fixed != null && fixed) { - if (fixed != null && fixed) { + /* Only time series charts have time ranges so prefer those. */ + if (axisId.equals("X")) { + Long lowerTime = as.getLowerTimeRange(); + Long upperTime = as.getUpperTimeRange(); + if ( lowerTime != null && upperTime != null ) { + log.debug("Using time range: " + lowerTime + " - " + upperTime); + return lowerTime < upperTime + ? new Range(lowerTime, upperTime) + : new Range(upperTime, lowerTime); + } + } + Double upper = as.getUpperRange(); Double lower = as.getLowerRange();