Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java @ 7525:6650485c2c9b
Part fix for flys/issue1585: Use result from fitting to display interpolated W/Q points, too. TODO: Draw interpolated as circles.
author | Sascha L. Teichmann <teichmann@intevation.de> |
---|---|
date | Wed, 06 Nov 2013 19:12:46 +0100 |
parents | ed0e4208facd |
children | e4606eae8ea5 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Wed Nov 06 12:07:48 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/fixation/FixRealizingCompute.java Wed Nov 06 19:12:46 2013 +0100 @@ -8,6 +8,9 @@ package org.dive4elements.river.artifacts.states.fixation; +import java.text.DateFormat; +import java.util.Collection; +import java.util.Date; import java.util.List; import org.apache.log4j.Logger; @@ -24,15 +27,16 @@ import org.dive4elements.river.artifacts.model.ReportFacet; import org.dive4elements.river.artifacts.model.WQCKms; import org.dive4elements.river.artifacts.model.WQKms; -import org.dive4elements.river.artifacts.model.WQKmsFactory; import org.dive4elements.river.artifacts.model.fixings.FixOutlierFacet; import org.dive4elements.river.artifacts.model.fixings.FixRealizingCalculation; import org.dive4elements.river.artifacts.model.fixings.FixRealizingResult; -import org.dive4elements.river.artifacts.model.fixings.FixEventFacet; +import org.dive4elements.river.artifacts.model.fixings.FixReferenceEventsFacet; import org.dive4elements.river.artifacts.model.fixings.FixWQCurveFacet; import org.dive4elements.river.artifacts.model.fixings.FixWaterlevelFacet; import org.dive4elements.river.artifacts.resources.Resources; import org.dive4elements.river.artifacts.states.DefaultState; +import org.dive4elements.river.utils.Formatter; +import org.dive4elements.river.utils.UniqueDateFormatter; /** * State to compute the fixation realizing (vollmer) results. @@ -48,9 +52,6 @@ public static final String I18N_WQ_OUTLIER = "fix.vollmer.wq.outliers"; - public static final String I18N_WQ_EVENTS = "fix.vollmer.wq.events"; - - /** * The default constructor that initializes an empty State object. */ @@ -122,6 +123,7 @@ facets.add(q); facets.add(csFacet); + // XXX: THIS CAN NOT HAPPEN! REMOVE IT! if (wqkms[i] instanceof WQCKms) { String nameC = nameW.replace( "benutzerdefiniert", @@ -134,10 +136,18 @@ } } - // Add one facet per event. + DateFormat df = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy"); + DateFormat lf = Formatter.getDateFormatter(context.getMeta(), "dd.MM.yyyy'T'HH:mm"); + + Collection<Date> reds = fixRes.getReferenceEventsDates(); + UniqueDateFormatter cf = new UniqueDateFormatter(df, lf, reds); + int i = 0; - for (int event: access.getEvents()) { - facets.add(new FixEventFacet(i, FIX_EVENTS, WQKmsFactory.getWQKmsName(event))); + for (Date d: reds) { + facets.add(new FixReferenceEventsFacet( + (1 << 9) | i, + FIX_EVENTS, + cf.format(d))); i++; }