[PATCH 3 of 4] (issue1391)Add compatibility for hist.discharge in Hist discharge output

Wald Commits scm-commit at wald.intevation.org
Mon Aug 19 10:06:30 CEST 2013


# HG changeset patch
# User Andre Heinecke <aheinecke at intevation.de>
# Date 1376642624 -7200
# Node ID 089b48c3131e0c72afe7bbf457f87758f5aed315
# Parent  863a67e10c0c280a5781ae60e7f4e7e2cf8c7a47
(issue1391)Add compatibility for hist.discharge in Hist discharge output

diff -r 863a67e10c0c -r 089b48c3131e artifacts/doc/conf/artifacts/winfo.xml
--- 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"/>
diff -r 863a67e10c0c -r 089b48c3131e artifacts/src/main/java/org/dive4elements/river/exports/HistoricalDischargeWQCurveGenerator.java
--- 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),


More information about the Dive4elements-commits mailing list