Mercurial > dive4elements > river
changeset 1098:1ea7eb72aaa6
Minor cosmetics.
flys-artifacts/trunk@2601 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 29 Aug 2011 08:58:03 +0000 |
parents | 94df49614d92 |
children | af73f196eccc |
files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java |
diffstat | 4 files changed, 32 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Aug 26 15:32:58 2011 +0000 +++ b/flys-artifacts/ChangeLog Mon Aug 29 08:58:03 2011 +0000 @@ -1,3 +1,16 @@ +2011-08-29 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + Minor cosmetics. + + * src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java: + Resolved a TODO. + + * src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java: + Added some documentation. + + * src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java: + Minor cosmetic. + 2011-08-26 Sascha L. Teichmann <sascha.teichmann@intevation.de> * doc/conf/meta-data.xml: Made it Oracle compatible.
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java Fri Aug 26 15:32:58 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WMSLayerFacet.java Mon Aug 29 08:58:03 2011 +0000 @@ -22,8 +22,9 @@ import de.intevation.flys.artifacts.states.DefaultState.ComputeType; -public class WMSLayerFacet extends DefaultFacet { - +public class WMSLayerFacet +extends DefaultFacet +{ protected ComputeType type; protected List<String> layers; protected String stateId;
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java Fri Aug 26 15:32:58 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WstValueTable.java Mon Aug 29 08:58:03 2011 +0000 @@ -367,6 +367,11 @@ return interpolateW(km, qs, ws, null); } + + /** + * @param ws (output parameter), gets returned. + * @return output parameter ws. + */ public double [] interpolateW( double km, double [] qs, @@ -493,6 +498,17 @@ return !Double.isNaN(out[0]); } + + /** + * Look up interpolation of a Q at given positions. + * + * @param q the non-interpolated Q value. + * @param referenceKm the reference km (e.g. gauge position). + * @param kms positions for which to interpolate. + * @param ws (output) resulting interpolated ws. + * @param qs (output) resulting interpolated qs. + * @param errors calculation object to store errors. + */ public QPosition interpolate( double q, double referenceKm,
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Fri Aug 26 15:32:58 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ComputedDischargeCurveGenerator.java Mon Aug 29 08:58:03 2011 +0000 @@ -62,8 +62,6 @@ /** Pseudo-Dataseries to have a legend for annotations. */ protected XYSeriesCollection pseudoAnnotationData = null; - // TODO Let theme pass through to annotations-facets. - /** Trivial Constructor. */ public ComputedDischargeCurveGenerator () {