Mercurial > dive4elements > river
changeset 2668:53f42adf4505
Modified states and added new state for fixing analysis.
flys-artifacts/trunk@4351 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Mon, 07 May 2012 13:27:45 +0000 |
| parents | b75681c09ef8 |
| children | 7a124cb11d8e |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/fixanalysis.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/EventSelect.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationPeriod.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/GaugeRange.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java |
| diffstat | 7 files changed, 74 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Fri May 04 13:47:37 2012 +0000 +++ b/flys-artifacts/ChangeLog Mon May 07 13:27:45 2012 +0000 @@ -1,3 +1,15 @@ +2012-05-07 Raimund Renkert <raimund.renkert@intevation.de> + + * doc/conf/artifacts/fixanalysis.xml: + Changed state data and added new state. + + * src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java, + src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java, + src/main/java/de/intevation/flys/artifacts/states/fixation/EventSelect.java, + src/main/java/de/intevation/flys/artifacts/states/fixation/FixationPeriod.java, + src/main/java/de/intevation/flys/artifacts/states/fixation/GaugeRange.java: + Modified states and added new state for concrete event selection. + 2012-05-04 Felix Wolfsteller <felix.wolfsteller@intevation.de> * doc/conf/themes: Add text-bg properties to Area style.
--- a/flys-artifacts/doc/conf/artifacts/fixanalysis.xml Fri May 04 13:47:37 2012 +0000 +++ b/flys-artifacts/doc/conf/artifacts/fixanalysis.xml Mon May 07 13:27:45 2012 +0000 @@ -24,7 +24,9 @@ <state id="state.fix.location" description="state.fix.location" state="de.intevation.flys.artifacts.states.fixation.LocationSelect"> - <data name="location" type="Double[]"/> + <data name="from" type="Double"/> + <data name="to" type="Double"/> + <data name="step" type="Double"/> </state> <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition"> @@ -34,7 +36,8 @@ <state id="state.fix.period" description="state.fix.period" state="de.intevation.flys.artifacts.states.fixation.FixationPeriod"> - <data name="period" type="Long[]"/> + <data name="start" type="Long"/> + <data name="end" type="Long"/> </state> <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition"> @@ -44,11 +47,22 @@ <state id="state.fix.gaugerange" description="state.fix.gaugerange" state="de.intevation.flys.artifacts.states.fixation.GaugeRange"> - <data name="gaugerange" type="Integer[]"/> + <data name="q1" type="Integer"/> + <data name="q2" type="Integer"/> + </state> + + <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition"> + <from state="state.fix.gaugerange"/> + <to state="state.fix.eventselect"/> + </transition> + + <state id="state.fix.eventselect" description="state.fix.eventselect" + state="de.intevation.flys.artifacts.states.fixation.EventSelect"> + <data name="events" type="Integer[]"/> </state> <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition"> - <from state="state.fix.gaugerange"/> + <from state="state.fix.eventselect"/> <to state="state.fix.analysis.referenceperiod"/> <condition data="calculation.mode" value="calculation.analysis" operator="equal"/>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/EventSelect.java Mon May 07 13:27:45 2012 +0000 @@ -0,0 +1,27 @@ +package de.intevation.flys.artifacts.states.fixation; + +import org.apache.log4j.Logger; + +import de.intevation.flys.artifacts.states.DefaultState; + +/** + * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> + */ +public class EventSelect extends DefaultState { + + /** The logger used in this class. */ + private static Logger logger = Logger.getLogger(EventSelect.class); + + + /** + * The default constructor that initializes an empty State object. + */ + public EventSelect() { + } + + @Override + protected String getUIProvider() { + return "fix.event_panel"; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationPeriod.java Fri May 04 13:47:37 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationPeriod.java Mon May 07 13:27:45 2012 +0000 @@ -33,5 +33,10 @@ public FixationPeriod() { } + @Override + protected String getUIProvider() { + return "fix.period_panel"; + } + } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java Fri May 04 13:47:37 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationSelect.java Mon May 07 13:27:45 2012 +0000 @@ -29,10 +29,10 @@ /** Constant value for the default fixation calculation. */ - public static final String CALCULATION_DEFAULT = "calc.fixation.default"; + public static final String CALCULATION_DEFAULT = "calculation.analysis"; /** Constant value for the volmer fixation analysis. */ - public static final String CALCULATION_VOLMER = "calc.fixation.volmer"; + public static final String CALCULATION_VOLMER = "calculation.volmer"; /** An Array that holds all available calculation modes.*/ public static final String[] CALCULATIONS = {
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/GaugeRange.java Fri May 04 13:47:37 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/GaugeRange.java Mon May 07 13:27:45 2012 +0000 @@ -33,5 +33,10 @@ public GaugeRange() { } + + @Override + protected String getUIProvider() { + return "fix.gaugeselect_panel"; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java Fri May 04 13:47:37 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/QSelect.java Mon May 07 13:27:45 2012 +0000 @@ -33,5 +33,10 @@ public QSelect() { } + + @Override + protected String getUIProvider() { + return "fix.qselect_panel"; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :