Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java @ 3811:1558ef7b0e7b
Picked rev3357, rev3359 and rev3360 from trunk.
flys-artifacts/tags/pre2.6-2011-12-05@3362 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 07 Dec 2011 13:36:36 +0000 |
parents | f6a190f6aaff |
children | c68f4f227c09 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Mon Dec 05 10:51:15 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MainValuesWFacet.java Wed Dec 07 13:36:36 2011 +0000 @@ -22,11 +22,15 @@ extends DefaultFacet implements FacetTypes { + /** Do we want MainValues at Gauge (not interpolated)? */ + protected boolean isAtGauge; + /** Trivial Constructor. */ - public MainValuesWFacet(String name, String description) { + public MainValuesWFacet(String name, String description, boolean atGauge) { this.description = description; this.name = name; - index = 0; + this.index = 0; + this.isAtGauge = atGauge; } @@ -42,7 +46,7 @@ public Object getData(Artifact artifact, CallContext context) { MainValuesArtifact mvArtifact = (MainValuesArtifact) artifact; - List<NamedDouble> ws = mvArtifact.getMainValuesW(); + List<NamedDouble> ws = mvArtifact.getMainValuesW(isAtGauge); List<XYTextAnnotation> xy = new ArrayList<XYTextAnnotation>(); for (NamedDouble w: ws) { @@ -50,7 +54,6 @@ w.getName(), (float) w.getValue(), StickyAxisAnnotation.SimpleAxis.Y_AXIS)); - } return new FLYSAnnotation(description, xy); @@ -63,7 +66,8 @@ */ @Override public MainValuesWFacet deepCopy() { - MainValuesWFacet copy = new MainValuesWFacet(this.name, description); + MainValuesWFacet copy = new MainValuesWFacet(this.name, + description, this.isAtGauge); copy.set(this); return copy; }