# HG changeset patch # User Björn Ricks # Date 1349078861 -7200 # Node ID a9cdd5fae878310885781720ec0c16b95ca642a6 # Parent c4400ccf158b2c58c5d145e21eeab0d54766b935 Add Facet type for GaugeDischargeCurveArtifact diff -r c4400ccf158b -r a9cdd5fae878 flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java --- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Mon Oct 01 10:06:40 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java Mon Oct 01 10:07:41 2012 +0200 @@ -179,6 +179,7 @@ String HYK = "hyk"; String DISCHARGE_CURVE = "discharge_curve.curve"; + String GAUGE_DISCHARGE_CURVE = "gauge_discharge_curve"; String DURATION_W = "duration_curve.w"; String DURATION_Q = "duration_curve.q"; diff -r c4400ccf158b -r a9cdd5fae878 flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java --- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java Mon Oct 01 10:06:40 2012 +0200 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java Mon Oct 01 10:07:41 2012 +0200 @@ -1,7 +1,7 @@ package de.intevation.flys.exports; import de.intevation.artifactdatabase.state.ArtifactAndFacet; -import de.intevation.flys.artifacts.WINFOArtifact; +import de.intevation.flys.artifacts.FLYSArtifact; import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.WQKms; import de.intevation.flys.jfree.Bounds; @@ -121,9 +121,10 @@ String name = artifactFacet.getFacetName(); logger.debug("DischargeCurveGenerator.doOut: " + name); - if (name.equals(DISCHARGE_CURVE)) { + if (name.equals(DISCHARGE_CURVE) + || name.equals(GAUGE_DISCHARGE_CURVE)) { doDischargeOut( - (WINFOArtifact) artifactFacet.getArtifact(), + (FLYSArtifact)artifactFacet.getArtifact(), artifactFacet.getData(context), artifactFacet.getFacetDescription(), theme, @@ -153,7 +154,7 @@ * Add series with discharge curve to diagram. */ protected void doDischargeOut( - WINFOArtifact artifact, + FLYSArtifact artifact, Object o, String description, Document theme,