Mercurial > dive4elements > river
changeset 399:53cc794fee07
Improved the transition model and added states to enable the 'discharge longitudinal section' computation - NOTE: the work in this computation has not finished yet.
flys-artifacts/trunk@1830 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Thu, 05 May 2011 06:12:44 +0000 |
| parents | 435058da0eae |
| children | 7e5c2e93e449 |
| files | flys-artifacts/ChangeLog flys-artifacts/doc/conf/artifacts/winfo.xml flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java |
| diffstat | 5 files changed, 205 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Thu May 05 05:27:41 2011 +0000 +++ b/flys-artifacts/ChangeLog Thu May 05 06:12:44 2011 +0000 @@ -1,3 +1,21 @@ +2011-05-05 Ingo Weinzierl <ingo@intevation.de> + + * doc/conf/artifacts/winfo.xml: Improved the transition model to reach the + output state for creating 'discharge longitudinal section' charts. + + * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Added a + method that returns all gauges of the selected river based on a the + given kilometer range. + + * src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java: New. + This state creates a set of elements for the DESCRIBE that consist of a + tuple of kilometer values. The number of elements depend on the number + of gauges intersected by the given kilometer range. + + * src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java: + New. This state is the output state that is reached after the 'discharge + longitudinal section' computation has been chosen. + 2011-05-05 Ingo Weinzierl <ingo@intevation.de> * src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java: Default
--- a/flys-artifacts/doc/conf/artifacts/winfo.xml Thu May 05 05:27:41 2011 +0000 +++ b/flys-artifacts/doc/conf/artifacts/winfo.xml Thu May 05 06:12:44 2011 +0000 @@ -33,6 +33,12 @@ <condition data="calculation_mode" value="calc.duration.curve" operator="equal"/> </transition> + <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition"> + <from state="state.winfo.calculation_mode"/> + <to state="state.winfo.location_distance"/> + <condition data="calculation_mode" value="calc.discharge.longitudinal.section" operator="equal"/> + </transition> + <state id="state.winfo.location" description="state.winfo.location" state="de.intevation.flys.artifacts.states.LocationSelect"> <data name="ld_locations" type="Double[]" /> @@ -63,9 +69,16 @@ </outputmodes> </state> - <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition"> + <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition"> <from state="state.winfo.location_distance"/> <to state="state.winfo.wq"/> + <condition data="calculation_mode" value="calc.surface.curve" operator="equal"/> + </transition> + + <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition"> + <from state="state.winfo.location_distance"/> + <to state="state.winfo.wq_adapted"/> + <condition data="calculation_mode" value="calc.discharge.longitudinal.section" operator="equal"/> </transition> <transition transition="de.intevation.flys.artifacts.transitions.ValueCompareTransition"> @@ -89,6 +102,12 @@ <data name="wq_single" type="Double[]" /> </state> + <state id="state.winfo.wq_adapted" description="state.winfo.wq_adapted" state="de.intevation.flys.artifacts.states.WQAdapted"> + <!-- TODO Add data objects --> + <data name="wq_mode" type="String" /> + <data name="wq_values" type="WQTriple" /> + </state> + <state id="state.winfo.durationcurve" description="state.winfo.durationcurve" state="de.intevation.flys.artifacts.states.DurationCurveState"> <outputmodes> <outputmode name="duration_curve" description="output.duration_curve" mime-type="image/png"> @@ -127,6 +146,11 @@ <condition data="calculation_mode" value="calc.surface.curve" operator="equal"/> </transition> + <transition transition="de.intevation.flys.artifacts.transitions.DefaultTransition"> + <from state="state.winfo.wq_adapted"/> + <to state="state.winfo.discharge_longitudinal_section"/> + </transition> + <state id="state.winfo.waterlevel" description="state.winfo.waterlevel" state="de.intevation.flys.artifacts.states.WaterlevelState"> <outputmodes> <outputmode name="longitudinal_section" description="output.longitudinal_section" mime-type="image/png"> @@ -143,5 +167,15 @@ </outputmodes> </state> + <state id="state.winfo.discharge_longitudinal_section" description="state.winfo.discharge_longitudinal_section" state="de.intevation.flys.artifacts.states.DischargeLongitudinalSection"> + <outputmodes> + <outputmode name="discharge_longitudinal_section" description="output.discharge_longitudinal_section" mime-type="image/png"> + <facets> + <facet name="discharge_longitudinal_section.w"/> + </facets> + </outputmode> + </outputmodes> + </state> + </states> </artifact>
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Thu May 05 05:27:41 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java Thu May 05 06:12:44 2011 +0000 @@ -596,6 +596,19 @@ /** + * Returns the gauges that match the selected kilometer range. + * + * @return the gauges based on the selected kilometer range. + */ + public List<Gauge> getGauges() { + River river = getRiver(); + double[] dist = getDistance(); + + return river.determineGauges(dist[0], dist[1]); + } + + + /** * This method returns the Q values. * * @return the selected Q values or null, if no Q values are selected.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/DischargeLongitudinalSection.java Thu May 05 06:12:44 2011 +0000 @@ -0,0 +1,30 @@ +package de.intevation.flys.artifacts.states; + +import org.apache.log4j.Logger; + +import org.w3c.dom.Element; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.CallContext; + +import de.intevation.artifacts.common.utils.XMLUtils; + + +public class DischargeLongitudinalSection extends DefaultState { + + /** The logger that is used in this state.*/ + private static Logger logger = + Logger.getLogger(DischargeLongitudinalSection.class); + + + protected Element[] createItems( + XMLUtils.ElementCreator cr, + Artifact artifact, + String name, + CallContext context) + { + logger.debug("DischargeLongitudinalSection.createItems"); + return null; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java Thu May 05 06:12:44 2011 +0000 @@ -0,0 +1,109 @@ +package de.intevation.flys.artifacts.states; + +import java.util.List; + +import org.apache.log4j.Logger; + +import org.w3c.dom.Element; + +import de.intevation.artifacts.Artifact; +import de.intevation.artifacts.CallContext; + +import de.intevation.artifactdatabase.ProtocolUtils; + +import de.intevation.artifacts.common.utils.XMLUtils; + +import de.intevation.flys.model.Gauge; +import de.intevation.flys.model.Range; + +import de.intevation.flys.artifacts.FLYSArtifact; + + +/** + * @author <a href="mailto:ingo.weinzierl@intevation.de">Ingo Weinzierl</a> + */ +public class WQAdapted extends DefaultState { + + /** The logger used in this state.*/ + private static Logger logger = Logger.getLogger(WQAdapted.class); + + + /** + * This method creates one element for each gauge of the selected river that + * is intersected by the given kilometer range. Each element is a tuple of + * (from;to) where <i>from</i> is the lower bounds of the gauge or the lower + * kilometer range. <i>to</i> is the upper bounds of the gauge or the upper + * kilometer range. + * + * @param cr The ElementCreator. + * @param artifact The FLYS artifact. + * @param name The name of the data item. + * @param context The CallContext. + * + * @return a list of elements that consist of tuples of the intersected + * gauges of the selected river. + */ + protected Element[] createItems( + XMLUtils.ElementCreator cr, + Artifact artifact, + String name, + CallContext context) + { + logger.debug("WQAdapted.createItems"); + + FLYSArtifact flysArtifact = (FLYSArtifact) artifact; + + double[] dist = flysArtifact.getDistance(); + List<Gauge> gauges = flysArtifact.getGauges(); + + int num = gauges != null ? gauges.size() : 0; + + if (num == 0) { + logger.warn("Selected distance matches no gauges."); + return null; + } + + Element[] elements = new Element[num]; + + int idx = 0; + + for (Gauge gauge: gauges) { + Range range = gauge.getRange(); + double lower = range.getA().doubleValue(); + double upper = range.getB().doubleValue(); + + double from = dist[0] < lower ? lower : dist[0]; + double to = dist[1] > upper ? upper : dist[1]; + + String key = Double.toString(from) + ";" + Double.toString(to); + + elements[idx++] = createItem(cr, new String[] {key, ""}); + } + + return elements; + } + + + protected Element createItem(XMLUtils.ElementCreator cr, Object obj) { + Element item = ProtocolUtils.createArtNode(cr, "item", null, null); + Element label = ProtocolUtils.createArtNode(cr, "label", null, null); + Element value = ProtocolUtils.createArtNode(cr, "value", null, null); + + String[] arr = (String[]) obj; + + label.setTextContent(arr[0]); + value.setTextContent(arr[1]); + + item.appendChild(label); + item.appendChild(value); + + return item; + } + + + @Override + protected String getUIProvider() { + return "wq_panel_adapted"; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 :