comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java @ 9070:611a523fc42f

VegetationZoneAccessHelper, VegetationTablePanels verbessert
author gernotbelger
date Tue, 15 May 2018 18:04:36 +0200
parents 1ffd38826175
children 5a0e8d76582e
comparison
equal deleted inserted replaced
9069:1ffd38826175 9070:611a523fc42f
12 import java.util.ArrayList; 12 import java.util.ArrayList;
13 import java.util.Collection; 13 import java.util.Collection;
14 14
15 import org.apache.commons.lang.math.DoubleRange; 15 import org.apache.commons.lang.math.DoubleRange;
16 import org.dive4elements.artifacts.CallContext; 16 import org.dive4elements.artifacts.CallContext;
17 import org.dive4elements.river.artifacts.access.RiverAccess;
18 import org.dive4elements.river.artifacts.common.GeneralResultType; 17 import org.dive4elements.river.artifacts.common.GeneralResultType;
19 import org.dive4elements.river.artifacts.common.ResultRow; 18 import org.dive4elements.river.artifacts.common.ResultRow;
20 import org.dive4elements.river.artifacts.model.Calculation; 19 import org.dive4elements.river.artifacts.model.Calculation;
21 import org.dive4elements.river.artifacts.model.CalculationResult; 20 import org.dive4elements.river.artifacts.model.CalculationResult;
22 import org.dive4elements.river.artifacts.resources.Resources; 21 import org.dive4elements.river.artifacts.resources.Resources;
42 final Calculation problems = new Calculation(); 41 final Calculation problems = new Calculation();
43 42
44 final String calcModeLabel = Resources.getMsg(this.context.getMeta(), uinfo.getCalculationMode().name()); 43 final String calcModeLabel = Resources.getMsg(this.context.getMeta(), uinfo.getCalculationMode().name());
45 final String user = CalculationUtils.findArtifactUser(this.context, uinfo); 44 final String user = CalculationUtils.findArtifactUser(this.context, uinfo);
46 45
47 final RiverAccess access = new RiverAccess(uinfo); 46 final SalixLineAccess accessSalix = new SalixLineAccess(uinfo);
48 final River river = access.getRiver(); 47
49 final DoubleRange calcRange = null; 48 final River river = accessSalix.getRiver();
50 final RiverInfo riverInfo = new RiverInfo(river); 49 final RiverInfo riverInfo = new RiverInfo(river);
51 50
52 final SalixLineAccess accessSalix = new SalixLineAccess(uinfo);
53 final DoubleRange range = accessSalix.getRange(); 51 final DoubleRange range = accessSalix.getRange();
54 final boolean useScenario = accessSalix.getUseScenario(); 52 final boolean useScenario = accessSalix.getUseScenario();
55 final String selectedScenario = accessSalix.getScenario(); 53 final String selectedScenario = accessSalix.getScenario();
56 final double fromPart = accessSalix.getFromPart(); 54 final double fromPart = accessSalix.getFromPart();
57 final double toPart = accessSalix.getToPart(); 55 final double toPart = accessSalix.getToPart();
59 // ld_from , ld_to 57 // ld_from , ld_to
60 // use_scenario (boolean) 58 // use_scenario (boolean)
61 // ld_from_part; ld_to_part 59 // ld_from_part; ld_to_part
62 // scenario_selection (mögliche Werte:"scenarioType.option1" "scenarioType.option2" "scenarioType.option3" 60 // scenario_selection (mögliche Werte:"scenarioType.option1" "scenarioType.option2" "scenarioType.option3"
63 61
64 final SalixLineCalculationResults results = new SalixLineCalculationResults(calcModeLabel, user, riverInfo, calcRange); 62 // FIXME: real calculation
63
64 final SalixLineCalculationResults results = new SalixLineCalculationResults(calcModeLabel, user, riverInfo, range);
65 65
66 final Collection<ResultRow> rows = new ArrayList<>(); 66 final Collection<ResultRow> rows = new ArrayList<>();
67 67
68 final ResultRow row1 = ResultRow.create(). // 68 final ResultRow row1 = ResultRow.create(). //
69 putValue(GeneralResultType.station, 100).// 69 putValue(GeneralResultType.station, 100).//

http://dive4elements.wald.intevation.org