Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/GaugeDischargeCurveFacet.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
| author | gernotbelger |
|---|---|
| date | Fri, 19 Jan 2018 11:23:42 +0100 |
| parents | 5e38e2924c07 |
| children | 0a5239a1e46e |
comparison
equal
deleted
inserted
replaced
| 8854:7bbfb24e6eec | 8860:28df64078f27 |
|---|---|
| 95 values[0], | 95 values[0], |
| 96 transformToM(values[1], g.getDatum().doubleValue())); | 96 transformToM(values[1], g.getDatum().doubleValue())); |
| 97 } | 97 } |
| 98 return new WQKms(kms, values[0], values[1], name); | 98 return new WQKms(kms, values[0], values[1], name); |
| 99 } | 99 } |
| 100 double[] ws = transformToM(values[1], ((Number)pnpObject).doubleValue()); | 100 double[] ws = transformToM( |
| 101 values[1], ((Number)pnpObject).doubleValue()); | |
| 101 | 102 |
| 102 return new WQKms(kms, values[0], ws, name); | 103 return new WQKms(kms, values[0], ws, name); |
| 103 } | 104 } |
| 104 | 105 |
| 105 private double[] transformToM(double[] ws, double pnp) { | 106 private double[] transformToM(double[] ws, double pnp) { |