Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java @ 2410:388cd6fc451b
'Reduzierte Bezugslinien' make the code more self explaining.
flys-artifacts/trunk@4040 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 10 Feb 2012 17:28:28 +0000 |
| parents | dce0cc856357 |
| children |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java Fri Feb 10 16:33:36 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/WWAxisTypes.java Fri Feb 10 17:28:28 2012 +0000 @@ -2,7 +2,7 @@ import de.intevation.flys.artifacts.math.Function; import de.intevation.flys.artifacts.math.Identity; -import de.intevation.flys.artifacts.math.LinearFunction; +import de.intevation.flys.artifacts.math.AddScaleFunction; public class WWAxisTypes { @@ -51,6 +51,10 @@ return transform(ww, false); } + private static final double zero(Double d) { + return d == null ? 0 : d; + } + public WW.ApplyFunctionIterator transform(WW ww, boolean normalized) { Function function1; @@ -58,11 +62,11 @@ if (!normalized) { function1 = inCm1 - ? new LinearFunction(100d, -ww.getStartDatum()*100d) + ? new AddScaleFunction(-ww.getStartDatum(), 100d) : Identity.IDENTITY; function2 = inCm2 - ? new LinearFunction(100d, -ww.getEndDatum()*100d) + ? new AddScaleFunction(-ww.getEndDatum(), 100d) : Identity.IDENTITY; } else { @@ -70,8 +74,8 @@ double minW2 = ww.minWs2(); double scale1 = inCm1 ? 100d : 1d; double scale2 = inCm2 ? 100d : 1d; - function1 = new LinearFunction(scale1, -minW1); - function2 = new LinearFunction(scale1, -minW2); + function1 = new AddScaleFunction(-minW1, scale1); + function2 = new AddScaleFunction(-minW2, scale2); } return new WW.ApplyFunctionIterator(ww, function1, function2);