Mercurial > dive4elements > river
changeset 3913:bdf855b5693f
Fixing analysis longitudinal section chart has now initially deactivated A1/B facets
flys-artifacts/trunk@5581 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Mon, 24 Sep 2012 08:36:33 +0000 |
| parents | 5fce1908317f |
| children | 729bd242c82e |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java |
| diffstat | 2 files changed, 17 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Mon Sep 24 08:25:00 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon Sep 24 08:36:33 2012 +0000 @@ -1,3 +1,9 @@ +2012-09-24 Christian Lins <christian.lins@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java: + Fixing analysis longitudinal section chart has now initially + deactivated A1/B facets. W/Q and W(t) has activated facets. (#874) + 2012-09-24 Björn Ricks <bjoern.ricks@intevation.de> * src/main/java/de/intevation/flys/artifacts/services/GaugeOverviewInfoService.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Mon Sep 24 08:25:00 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixAnalysisCompute.java Mon Sep 24 08:36:33 2012 +0000 @@ -79,16 +79,18 @@ Facet facet, String output ) { - String name = facet.getName(); + if (output.contains(FacetTypes.ChartType.FLSC.toString())) { // Longitudinal section chart + String name = facet.getName(); - if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT) - || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS) - || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_WQ) - || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT) - || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS) - || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ) - ) { - return Boolean.FALSE; + if (name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_DWT) + || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_LS) + || name.contains(FacetTypes.FIX_ANALYSIS_EVENTS_WQ) + || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_DWT) + || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_LS) + || name.contains(FacetTypes.FIX_REFERENCE_EVENTS_WQ) + ) { + return Boolean.FALSE; + } } return Boolean.TRUE;