Mercurial > dive4elements > river
changeset 3457:35ead8fadc36
Add waterlevel facet and longitudinal_section out for fixationrealization.
flys-artifacts/trunk@5123 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 25 Jul 2012 10:11:52 +0000 |
| parents | c1fd75bd893a |
| children | 676f87e173f7 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java |
| diffstat | 2 files changed, 24 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Wed Jul 25 10:07:08 2012 +0000 +++ b/flys-artifacts/ChangeLog Wed Jul 25 10:11:52 2012 +0000 @@ -1,3 +1,11 @@ +2012-07-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> + + * src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java: + Add WaterlevelFacet. + + * doc/conf/artifacts/fixanalysis.xml: + Add output and facet compability. + 2012-07-25 Felix Wolfsteller <felix.wolfsteller@intevation.de> * src/main/java/de/intevation/flys/artifacts/access/FixRealizingAccess.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java Wed Jul 25 10:07:08 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixRealizingCompute.java Wed Jul 25 10:11:52 2012 +0000 @@ -9,9 +9,12 @@ import de.intevation.flys.artifacts.access.FixRealizingAccess; import de.intevation.flys.artifacts.model.CalculationResult; +import de.intevation.flys.artifacts.model.FacetTypes; import de.intevation.flys.artifacts.model.ReportFacet; +import de.intevation.flys.artifacts.model.WaterlevelFacet; import de.intevation.flys.artifacts.model.fixings.FixRealizingCalculation; +import de.intevation.flys.artifacts.model.fixings.FixRealizingResult; import de.intevation.flys.artifacts.states.DefaultState; @@ -19,13 +22,14 @@ import org.apache.log4j.Logger; + /** * @author <a href="mailto:raimund.renkert@intevation.de">Raimund Renkert</a> */ -public class FixRealizingCompute extends DefaultState { +public class FixRealizingCompute extends DefaultState implements FacetTypes { /** The logger used in this class. */ - private static Logger log = Logger.getLogger(FixRealizingCompute.class); + private static Logger logger = Logger.getLogger(FixRealizingCompute.class); /** * The default constructor that initializes an empty State object. @@ -41,7 +45,7 @@ List<Facet> facets, Object old ) { - log.debug("FixRealizingCompute.computeAdvance"); + logger.debug("FixRealizingCompute.computeAdvance"); CalculationResult res; @@ -64,7 +68,15 @@ facets.add(new ReportFacet(ComputeType.ADVANCE, hash, id)); } - // TODO: Added facets + // TODO: Add more facets. + FixRealizingResult fr = (FixRealizingResult) res.getData(); + + // WaterlevelFacet + // Also: DataFacet and WQstuff + // TODO naming, i18n. + String nameW = "waterlevel"; + facets.add(new WaterlevelFacet( + 0, LONGITUDINAL_W, nameW, ComputeType.ADVANCE, id, hash)); return res; }