Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculator.java @ 9429:bd5f5d2220fa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
9428:15f274e6d83b 9429:bd5f5d2220fa
26 import org.dive4elements.river.artifacts.model.Calculation; 26 import org.dive4elements.river.artifacts.model.Calculation;
27 import org.dive4elements.river.artifacts.model.WstValueTable; 27 import org.dive4elements.river.artifacts.model.WstValueTable;
28 import org.dive4elements.river.artifacts.model.WstValueTable.QPosition; 28 import org.dive4elements.river.artifacts.model.WstValueTable.QPosition;
29 import org.dive4elements.river.artifacts.model.WstValueTableFactory; 29 import org.dive4elements.river.artifacts.model.WstValueTableFactory;
30 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider; 30 import org.dive4elements.river.artifacts.sinfo.common.RiverInfoProvider;
31 import org.dive4elements.river.artifacts.sinfo.common.SInfoResultType;
32 import org.dive4elements.river.artifacts.sinfo.tkhstate.WinfoArtifactWrapper; 31 import org.dive4elements.river.artifacts.sinfo.tkhstate.WinfoArtifactWrapper;
33 import org.dive4elements.river.artifacts.uinfo.UINFOArtifact; 32 import org.dive4elements.river.artifacts.uinfo.UINFOArtifact;
34 import org.dive4elements.river.artifacts.uinfo.common.UInfoResultType; 33 import org.dive4elements.river.artifacts.uinfo.common.UInfoResultType;
35 import org.dive4elements.river.artifacts.uinfo.salix.SalixLineAccess.ScenarioType; 34 import org.dive4elements.river.artifacts.uinfo.salix.SalixLineAccess.ScenarioType;
36 import org.dive4elements.river.model.Gauge; 35 import org.dive4elements.river.model.Gauge;
149 // final double mw = interpolateW(station, this.gaugeMwPos.get(gauge)); 148 // final double mw = interpolateW(station, this.gaugeMwPos.get(gauge));
150 // final double mhw = interpolateW(station, this.gaugeMhwPos.get(gauge)); 149 // final double mhw = interpolateW(station, this.gaugeMhwPos.get(gauge));
151 final double mnw = interpolateW(station, this.refGaugeMnwPos); 150 final double mnw = interpolateW(station, this.refGaugeMnwPos);
152 final double mw = interpolateW(station, this.refGaugeMwPos); 151 final double mw = interpolateW(station, this.refGaugeMwPos);
153 final double mhw = interpolateW(station, this.refGaugeMhwPos); 152 final double mhw = interpolateW(station, this.refGaugeMhwPos);
154 row.putValue(SInfoResultType.waterlevel, mnw); 153 row.putValue(UInfoResultType.waterlevelMNW, mnw);
155 row.putValue(SInfoResultType.waterlevel1, mw); 154 row.putValue(UInfoResultType.waterlevelMW, mw);
156 row.putValue(SInfoResultType.waterlevel2, mhw); 155 row.putValue(UInfoResultType.waterlevelMHW, mhw);
156 // TODO: hier noch den W(HQ5)
157 row.putValue(UInfoResultType.waterlevelMH5, Double.NaN);
158
157 // Calc salix-line and mw-mnw 159 // Calc salix-line and mw-mnw
158 row.putValue(UInfoResultType.salixline, calcSalix(mhw, mw)); 160 row.putValue(UInfoResultType.salixline, calcSalix(mhw, mw));
159 row.putValue(UInfoResultType.salix_mw_mnw, calcMwmnw(mw, mnw)); 161 row.putValue(UInfoResultType.salix_mw_mnw, calcMwmnw(mw, mnw));
160 // Calc scenario values (always all scenario types set, Result variant extracts the fields needed) 162 // Calc scenario values (always all scenario types set, Result variant extracts the fields needed)
161 final List<SalixScenario> scenarios = new ArrayList<>(); 163 final List<SalixScenario> scenarios = new ArrayList<>();
http://dive4elements.wald.intevation.org