Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java @ 3043:22da13d1b180
Added facet for derivate curve and fixed facet names.
flys-artifacts/trunk@4612 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Wed, 06 Jun 2012 14:58:25 +0000 |
parents | b388d888330d |
children | fa763b270e78 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java Wed Jun 06 12:20:24 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java Wed Jun 06 14:58:25 2012 +0000 @@ -16,10 +16,11 @@ import de.intevation.flys.artifacts.model.fixings.FixAvSectorFacet; import de.intevation.flys.artifacts.model.fixings.FixAnalysisEventsFacet; +import de.intevation.flys.artifacts.model.fixings.FixAnalysisPeriodsFacet; import de.intevation.flys.artifacts.model.fixings.FixReferenceEventsFacet; import de.intevation.flys.artifacts.model.fixings.FixOutlierFacet; import de.intevation.flys.artifacts.model.fixings.FixWQCurveFacet; - +import de.intevation.flys.artifacts.model.fixings.FixDerivateFacet; import de.intevation.flys.artifacts.model.fixings.DateRange; @@ -86,7 +87,7 @@ for (int i = 0; i < count; i++) { DateRange period = access.getAnalysisPeriods()[i]; for (int j = access.getQSectorStart().intValue(); - j < access.getQSectorEnd().intValue(); + j <= access.getQSectorEnd().intValue(); j++) { //TODO: replace j with q sector string. String description = j + ": " + @@ -94,16 +95,54 @@ period.getTo().toString(); facets.add( new FixAvSectorFacet(j - access.getQSectorStart().intValue(), + FIX_SECTOR_AVERAGE_DWT, description)); + facets.add( + new FixAvSectorFacet(j - access.getQSectorStart().intValue(), + FIX_SECTOR_AVERAGE_LS, + description)); + facets.add( + new FixAvSectorFacet(j - access.getQSectorStart().intValue(), + FIX_SECTOR_AVERAGE_WQ, + description)); + } String eventDesc = period.getFrom().toString() + " - " + period.getTo().toString(); - facets.add(new FixAnalysisEventsFacet(i, eventDesc)); + facets.add(new FixAnalysisEventsFacet(i, + FIX_ANALYSIS_EVENTS_DWT, + eventDesc)); + facets.add(new FixAnalysisEventsFacet(i, + FIX_ANALYSIS_EVENTS_LS, + eventDesc)); + facets.add(new FixAnalysisEventsFacet(i, + FIX_ANALYSIS_EVENTS_WQ, + eventDesc)); } - facets.add(new FixReferenceEventsFacet(0, "Referenceperiod")); + facets.add(new FixReferenceEventsFacet(0, + FIX_REFERENCE_EVENTS_DWT, + "Referenceperiod")); + facets.add(new FixReferenceEventsFacet(1, + FIX_REFERENCE_EVENTS_LS, + "Referenceperiod")); + facets.add(new FixReferenceEventsFacet(2, + FIX_REFERENCE_EVENTS_WQ, + "Referenceperiod")); + + facets.add(new FixAnalysisPeriodsFacet(0, + FIX_ANALYSIS_PERIODS_DWT, + "Analysis periods")); + facets.add(new FixAnalysisPeriodsFacet(1, + FIX_ANALYSIS_PERIODS_LS, + "Analysis periods")); + facets.add(new FixAnalysisPeriodsFacet(2, + FIX_ANALYSIS_PERIODS_WQ, + "Analysis periods")); + facets.add(new FixWQCurveFacet("W/Q")); - facets.add(new FixOutlierFacet("Outlier")); + facets.add(new FixOutlierFacet(FIX_OUTLIER, "Outlier")); + facets.add(new FixDerivateFacet(FIX_DERIVATE, "Derivative")); return res; }