diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java @ 3131:bac0b2721451

FixA: Added delta W(t) chart in fix analysis. flys-artifacts/trunk@4732 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Raimund Renkert <raimund.renkert@intevation.de>
date Wed, 20 Jun 2012 16:10:59 +0000
parents 5e9533687a0c
children 6f6a8e5fb7a4
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Wed Jun 20 15:33:32 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/fixation/FixationCompute.java	Wed Jun 20 16:10:59 2012 +0000
@@ -23,6 +23,7 @@
 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.FixDeviationFacet;
 
 import de.intevation.flys.artifacts.model.fixings.DateRange;
 
@@ -114,16 +115,21 @@
                 String description = sector + ": " +
                                      startDate + " - " +
                                      endDate;
+
+                int sectorNdx = j - access.getQSectorStart().intValue();
+                int facetNdx = i << 2;
+                facetNdx = facetNdx | j;
+
                 facets.add(
-                    new FixAvSectorFacet(j - access.getQSectorStart().intValue(),
-                                         FIX_SECTOR_AVERAGE_DWT,
+                    new FixAvSectorFacet(facetNdx,
+                                         FIX_SECTOR_AVERAGE_DWT + "_" + sectorNdx,
                                          description));
                 facets.add(
-                    new FixAvSectorFacet(j - access.getQSectorStart().intValue(),
+                    new FixAvSectorFacet(facetNdx,
                                          FIX_SECTOR_AVERAGE_LS,
                                          description));
                 facets.add(
-                    new FixAvSectorFacet(j - access.getQSectorStart().intValue(),
+                    new FixAvSectorFacet(facetNdx,
                                          FIX_SECTOR_AVERAGE_WQ,
                                          description));
 
@@ -177,6 +183,7 @@
                 I18N_DERIVATIVE,
                 I18N_DERIVATIVE)));
 
+        facets.add(new FixDeviationFacet(FIX_DEVIATION_DWT, "Abweichung"));
         return res;
     }
 }

http://dive4elements.wald.intevation.org