Mercurial > dive4elements > river
changeset 6850:089b48c3131e
(issue1391)Add compatibility for hist.discharge in Hist discharge output
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 16 Aug 2013 10:43:44 +0200 |
| parents | 863a67e10c0c |
| children | 4937dab5ff7a |
| files | artifacts/doc/conf/artifacts/winfo.xml artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeWQCurveGenerator.java |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/winfo.xml Fri Aug 16 09:39:27 2013 +0200 +++ b/artifacts/doc/conf/artifacts/winfo.xml Fri Aug 16 10:43:44 2013 +0200 @@ -642,6 +642,7 @@ </outputmode> <outputmode name="historical_discharge_wq" description="output.historical_discharge_wq.description" mime-type="image/png" type="chart"> <facets> + <facet name="discharge_curve.curve"/> <facet name="historical_discharge.wq.q"/> <facet name="historical_discharge.wq.w"/> <facet name="historical_discharge.wq.curve"/>
--- a/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeWQCurveGenerator.java Fri Aug 16 09:39:27 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeWQCurveGenerator.java Fri Aug 16 10:43:44 2013 +0200 @@ -124,7 +124,9 @@ artifactFacet.getData(context), artifactFacet.getFacetDescription(), theme, visible); } - else if (name.equals(HISTORICAL_DISCHARGE_WQ_CURVE)) { + else if (name.equals(HISTORICAL_DISCHARGE_WQ_CURVE) || + name.equals(DISCHARGE_CURVE) || + name.equals(GAUGE_DISCHARGE_CURVE)) { doHistoricalDischargeCurveOut( (D4EArtifact) artifactFacet.getArtifact(), artifactFacet.getData(context),