Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java @ 3272:31168ac9c7e7
Partial fix for issue694 (heightmarks snap to nearest cross section).
flys-artifacts/trunk@4916 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Tue, 10 Jul 2012 15:31:56 +0000 |
parents | 7e5460d08eb0 |
children | f903f1e5aed6 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Tue Jul 10 13:26:13 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/WINFOArtifact.java Tue Jul 10 15:31:56 2012 +0000 @@ -209,7 +209,7 @@ * in WstValueTable. * * @param kms The kilometer values. - * @param qa The discharge values. + * @param qs The discharge values. * @param wst The WstValueTable used for the interpolation. * * @return an array of data triples that consist of W, Q and Kms. @@ -329,7 +329,8 @@ /** * Computes the data used to create computed discharge curves. * - * @param wst The WstValueTable that is used for the interpolation. + * @param wst The WstValueTable that is used for the interpolation (river- + * bound). * @param location The location where the computation should be based on. * * @return an object that contains tuples of W/Q values at the specified @@ -346,6 +347,8 @@ return calculation.calculate(wst); } + + /** Create CalculationResult with data and message. */ protected static final CalculationResult error(Object data, String msg) { return new CalculationResult(data, new Calculation(msg)); } @@ -580,12 +583,15 @@ * * @param idx Index for getWaterlevelData. * @param csl The profile/surface to fill with water. + * @param nextIgnored Ignored in this implementation of WaterLineArtifact. + * @param prevIgnored Ignored in this implementation of WaterLineArtifact. * * @return an array holding coordinates of points of surface of water ( * in the form {{x1, x2} {y1, y2}} ). */ @Override - public Lines.LineData getWaterLines(int idx, FastCrossSectionLine csl) { + public Lines.LineData getWaterLines(int idx, FastCrossSectionLine csl, + double nextIgnored, double prevIgnored) { logger.debug("getWaterLines(" + idx + ")"); List<Point2D> points = csl.getPoints(); @@ -1188,8 +1194,9 @@ DURATION_Q }; + /** - * Returns the WstValueTable. + * Returns the WstValueTable of current river. */ public WstValueTable getWstValueTable() { River r = FLYSUtils.getRiver(this);