Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flood_duration/FloodDurationCurveGenerator.java @ 9595:9b39cfd39e59
Softwaretests...20181219 6.2.2: Sinfo/Ued Haupt-/Extremwerte queried for the current chart km instead of only the first in range
| author | mschaefer |
|---|---|
| date | Tue, 05 Feb 2019 15:31:13 +0100 |
| parents | 9b8e8fc1f408 |
| children |
comparison
equal
deleted
inserted
replaced
| 9594:225e48df608c | 9595:9b39cfd39e59 |
|---|---|
| 14 import java.io.OutputStream; | 14 import java.io.OutputStream; |
| 15 | 15 |
| 16 import org.apache.log4j.Logger; | 16 import org.apache.log4j.Logger; |
| 17 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; | 17 import org.dive4elements.artifactdatabase.state.ArtifactAndFacet; |
| 18 import org.dive4elements.artifacts.CallContext; | 18 import org.dive4elements.artifacts.CallContext; |
| 19 import org.dive4elements.river.artifacts.MainValuesArtifact; | |
| 19 import org.dive4elements.river.artifacts.model.FacetTypes; | 20 import org.dive4elements.river.artifacts.model.FacetTypes; |
| 20 import org.dive4elements.river.artifacts.model.WQDay; | 21 import org.dive4elements.river.artifacts.model.WQDay; |
| 21 import org.dive4elements.river.exports.IdentifiableNumberAxis; | 22 import org.dive4elements.river.exports.IdentifiableNumberAxis; |
| 22 import org.dive4elements.river.exports.XYChartGenerator; | 23 import org.dive4elements.river.exports.XYChartGenerator; |
| 23 import org.dive4elements.river.exports.fixings.FixChartGenerator; | 24 import org.dive4elements.river.exports.fixings.FixChartGenerator; |
| 176 || name.equals(FloodDurationCurveProcessor.FACET_FLOOD_DURATION_MAINVALUES_W)) { | 177 || name.equals(FloodDurationCurveProcessor.FACET_FLOOD_DURATION_MAINVALUES_W)) { |
| 177 doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); | 178 doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); |
| 178 } else if (FloodDurationCurveProcessor.isInfrastructureFacet(name) && (artifactFacet.getData(context) != null)) { | 179 } else if (FloodDurationCurveProcessor.isInfrastructureFacet(name) && (artifactFacet.getData(context) != null)) { |
| 179 doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); | 180 doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); |
| 180 } else if (name.equals(MAINVALUES_Q) || name.equals(MAINVALUES_W)) { | 181 } else if (name.equals(MAINVALUES_Q) || name.equals(MAINVALUES_W)) { |
| 181 doAnnotations((RiverAnnotation) artifactFacet.getData(context), artifactFacet, attr, visible); | 182 final MainValuesArtifact mva = new MainValuesArtifactWrapper((MainValuesArtifact) artifactFacet.getArtifact()); |
| 183 if (context.getContextValue("currentKm") != null) | |
| 184 mva.addStringData("ld_locations", context.getContextValue("currentKm").toString()); | |
| 185 final ArtifactAndFacet mvaf = new ArtifactAndFacet(mva, artifactFacet.getFacet()); | |
| 186 doAnnotations((RiverAnnotation) mvaf.getData(context), mvaf, attr, visible); | |
| 182 } | 187 } |
| 183 // else if (name.equals(RELATIVE_POINT)) { | 188 // else if (name.equals(RELATIVE_POINT)) { |
| 184 // doPointOut((Point2D) artifactFacet.getData(context), artifactFacet, attr, visible); | 189 // doPointOut((Point2D) artifactFacet.getData(context), artifactFacet, attr, visible); |
| 185 // } | 190 // } |
| 186 else if (FacetTypes.IS.MANUALPOINTS(name)) { | 191 else if (FacetTypes.IS.MANUALPOINTS(name)) { |