Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 8454:7003cf5c19ed | 8455:6dfc3a1fc70d |
|---|---|
| 950 return null; | 950 return null; |
| 951 } | 951 } |
| 952 | 952 |
| 953 Boolean fixed = as.isFixed(); | 953 Boolean fixed = as.isFixed(); |
| 954 | 954 |
| 955 | |
| 956 if (fixed != null && fixed) { | 955 if (fixed != null && fixed) { |
| 956 | |
| 957 /* Only time series charts have time ranges so prefer those. */ | |
| 958 if (axisId.equals("X")) { | |
| 959 Long lowerTime = as.getLowerTimeRange(); | |
| 960 Long upperTime = as.getUpperTimeRange(); | |
| 961 if ( lowerTime != null && upperTime != null ) { | |
| 962 log.debug("Using time range: " + lowerTime + " - " + upperTime); | |
| 963 return lowerTime < upperTime | |
| 964 ? new Range(lowerTime, upperTime) | |
| 965 : new Range(upperTime, lowerTime); | |
| 966 } | |
| 967 } | |
| 968 | |
| 957 Double upper = as.getUpperRange(); | 969 Double upper = as.getUpperRange(); |
| 958 Double lower = as.getLowerRange(); | 970 Double lower = as.getLowerRange(); |
| 959 | 971 |
| 960 if (upper != null && lower != null) { | 972 if (upper != null && lower != null) { |
| 961 return lower < upper | 973 return lower < upper |