Mercurial > dive4elements > river
changeset 2401:b56e8613ce0d
Adjust linear function offset.
flys-artifacts/trunk@4027 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 10 Feb 2012 11:02:23 +0000 |
| parents | f55984858952 |
| children | c5e4a2d67631 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri Feb 10 10:45:32 2012 +0000 +++ b/flys-artifacts/ChangeLog Fri Feb 10 11:02:23 2012 +0000 @@ -1,3 +1,8 @@ +2012-02-10 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java: + Adjust offset of linear function by same factor as the values. + 2012-02-10 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/exports/InfoGeneratorHelper.java: Write @@ -78,7 +83,8 @@ * src/main/java/de/intevation/flys/artifacts/model/WW.java: Add accessors to relative heights. - * + * src/main/java/de/intevation/flys/exports/ReferenceCurveExporter.java: + Add relative heights (to gauge) to csv export. 2012-02-09 Ingo Weinzierl <ingo@intevation.de>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java Fri Feb 10 10:45:32 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java Fri Feb 10 11:02:23 2012 +0000 @@ -50,11 +50,11 @@ if (!normalized) { function1 = inCm1 - ? new LinearFunction(100d, -ww.getStartDatum()) + ? new LinearFunction(100d, -ww.getStartDatum()*100d) : Identity.IDENTITY; function2 = inCm2 - ? new LinearFunction(100d, -ww.getEndDatum()) + ? new LinearFunction(100d, -ww.getEndDatum()*100d) : Identity.IDENTITY; } else { @@ -66,7 +66,6 @@ function2 = new LinearFunction(scale1, -minW2); } - return new WW.ApplyFunctionIterator(ww, function1, function2); } }