Mercurial > dive4elements > river
changeset 9057:2be202a8cb89
local merge
author | gernotbelger |
---|---|
date | Fri, 04 May 2018 14:50:13 +0200 |
parents | 95643dffd006 |
children | d3bef221b7d9 |
files | artifacts/doc/conf/artifacts/sinfo.xml artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/YearChoice.java artifacts/src/main/resources/messages.properties |
diffstat | 3 files changed, 66 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/doc/conf/artifacts/sinfo.xml Fri May 04 13:36:01 2018 +0200 +++ b/artifacts/doc/conf/artifacts/sinfo.xml Fri May 04 14:50:13 2018 +0200 @@ -226,21 +226,57 @@ <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> <from state="state.sinfo.distance_only"/> - <to state="state.sinfo.year"/> + <to state="state.sinfo.year_epoch"/> <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/> </transition> - <state id="state.sinfo.year" description="state.sinfo.year" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.year"> - <data name="year" type="Boolean"/> + <state id="state.sinfo.year_epoch" description="state.sinfo.year_epoch" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.year"> + <data name="ye_select" type="String"/> </state> + + <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> + <from state="state.sinfo.year_epoch"/> + <to state="state.sinfo.year_select"/> + <condition data="ye_select" value="state.sinfo.year" operator="equal"/> + </transition> + + <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> + <from state="state.sinfo.year_epoch"/> + <to state="state.sinfo.epoch_select"/> + <condition data="ye_select" value="state.sinfo.epoch" operator="equal"/> + </transition> + + + <state id="state.sinfo.year_select" description="state.minfo.sediment.load.sq_interval" + state="org.dive4elements.river.artifacts.states.minfo.SedimentLoadSQTiSelect" + helpText="help.state.minfo.sediment.load.sq_interval"> + <data name="sq_ti_id" type="Integer" /> + <data name="sq_ti_date" type="String" /> + </state> + + + <state id="state.sinfo.epoch_select" description="state.sinfo.year_epoch" state="org.dive4elements.river.artifacts.sinfo.collision.YearChoice" helpText="help.state.sinfo.year"> + <data name="ye_select" type="String"/> + </state> + + + + <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> + <from state="state.sinfo.year_select"/> + <to state="state.sinfo.collision"/> + <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/> + </transition> + + <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> + <from state="state.sinfo.epoch_select"/> + <to state="state.sinfo.collision"/> + <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/> + </transition> + - <transition transition="org.dive4elements.river.artifacts.transitions.ValueCompareTransition"> - <from state="state.sinfo.year"/> - <to state="state.sinfo.collision"/> - <condition data="calculation_mode" value="sinfo_calc_collision" operator="equal"/> - </transition> + <state id="state.sinfo.collision" description="state.sinfo.collision" state="org.dive4elements.river.artifacts.sinfo.collision.CollisionState" helpText="help.state.sinfo.collision"> <outputmodes>
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/YearChoice.java Fri May 04 13:36:01 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/YearChoice.java Fri May 04 14:50:13 2018 +0200 @@ -8,16 +8,27 @@ package org.dive4elements.river.artifacts.sinfo.collision; -import org.dive4elements.river.artifacts.states.BooleanChoiceState; +import java.util.ArrayList; +import java.util.List; + +import org.dive4elements.river.artifacts.states.RadioSelect; /** * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> */ -public class YearChoice extends BooleanChoiceState { - +public class YearChoice extends RadioSelect { private static final long serialVersionUID = 1L; public YearChoice() { - super("option", "active", "inactive"); // TODO: RADIO-Btn-Impl + super(); + } + + @Override + protected List<String> makeEntries() { + final List<String> entries = new ArrayList<>(); + entries.add("state.sinfo.year"); + entries.add("state.sinfo.epoch"); + return entries; + } } \ No newline at end of file
--- a/artifacts/src/main/resources/messages.properties Fri May 04 13:36:01 2018 +0200 +++ b/artifacts/src/main/resources/messages.properties Fri May 04 14:50:13 2018 +0200 @@ -75,6 +75,13 @@ state.minfo.t_per_a = t/a state.minfo.m3_per_a = m\u00b3/a +state.sinfo.year_epoch = Year/Epoch +state.sinfo.year=Year +state.sinfo.epoch=Epoch +state.sinfo.riverside.left = Linkes Ufer +state.sinfo.riverside.right = Rechtes Ufer +state.sinfo.riverside.both = Beide Ufer + year=Year epoch=Epoch off_epoch = off. Epochs