Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculator.java @ 9429:bd5f5d2220fa
Work on salix cross sections; waterlevels work now with different colors
Colors and i10n for all themes.
| author | gernotbelger |
|---|---|
| date | Fri, 17 Aug 2018 17:48:01 +0200 |
| parents | 6e7094368e97 |
| children | e8b1255fc89e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculator.java Fri Aug 17 17:40:59 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculator.java Fri Aug 17 17:48:01 2018 +0200 @@ -28,7 +28,6 @@ import org.dive4elements.river.artifacts.model.WstValueTable.QPosition; import org.dive4elements.river.artifacts.model.WstValueTableFactory; import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider; -import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType; import org.dive4elements.river.artifacts.sinfo.tkhstate.WinfoArtifactWrapper; import org.dive4elements.river.artifacts.uinfo.UINFOArtifact; import org.dive4elements.river.artifacts.uinfo.common.UInfoResultType; @@ -151,9 +150,12 @@ final double mnw = interpolateW(station, this.refGaugeMnwPos); final double mw = interpolateW(station, this.refGaugeMwPos); final double mhw = interpolateW(station, this.refGaugeMhwPos); - row.putValue(SInfoResultType.waterlevel, mnw); - row.putValue(SInfoResultType.waterlevel1, mw); - row.putValue(SInfoResultType.waterlevel2, mhw); + row.putValue(UInfoResultType.waterlevelMNW, mnw); + row.putValue(UInfoResultType.waterlevelMW, mw); + row.putValue(UInfoResultType.waterlevelMHW, mhw); + // TODO: hier noch den W(HQ5) + row.putValue(UInfoResultType.waterlevelMH5, Double.NaN); + // Calc salix-line and mw-mnw row.putValue(UInfoResultType.salixline, calcSalix(mhw, mw)); row.putValue(UInfoResultType.salix_mw_mnw, calcMwmnw(mw, mnw));