Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java @ 3610:66f539df4e8b
Issue 716.
FixA: Spilt reference and analysis period themes into one theme for each event.
flys-artifacts/trunk@5239 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Raimund Renkert <raimund.renkert@intevation.de> |
---|---|
date | Thu, 23 Aug 2012 08:49:37 +0000 |
parents | accb64be866c |
children | f3fc8d49d741 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java Wed Aug 22 14:51:19 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixLongitudinalSectionGenerator.java Thu Aug 23 08:49:37 2012 +0000 @@ -101,10 +101,9 @@ int index = aaf.getFacet().getIndex(); int sectorNdx = index & 3; - int periodNdx = index >> 2; - KMIndex<AnalysisPeriod[]> kms = - (KMIndex<AnalysisPeriod[]>)aaf.getData(context); + KMIndex<AnalysisPeriod> kms = + (KMIndex<AnalysisPeriod>)aaf.getData(context); if(kms == null) { return; @@ -112,10 +111,10 @@ XYSeries series = new StyledXYSeries(aaf.getFacetDescription(), doc); - for (KMIndex.Entry<AnalysisPeriod[]> entry: kms) { + for (KMIndex.Entry<AnalysisPeriod> entry: kms) { double km = entry.getKm(); - AnalysisPeriod[] ap = entry.getValue(); - QWD qwd = ap[periodNdx].getQSectorAverages()[sectorNdx]; + AnalysisPeriod ap = entry.getValue(); + QWD qwd = ap.getQSectorAverages()[sectorNdx]; if (qwd == null) { continue; } @@ -138,10 +137,9 @@ int index = aaf.getFacet().getIndex(); int sectorNdx = index & 3; - int periodNdx = index >> 2; - KMIndex<AnalysisPeriod[]> kms = - (KMIndex<AnalysisPeriod[]>)aaf.getData(context); + KMIndex<AnalysisPeriod> kms = + (KMIndex<AnalysisPeriod>)aaf.getData(context); if(kms == null) { return; @@ -154,11 +152,11 @@ new StyledXYSeries(aaf.getFacetDescription() + " ", false, doc); - for (KMIndex.Entry<AnalysisPeriod[]> entry: kms) { + for (KMIndex.Entry<AnalysisPeriod> entry: kms) { double km = entry.getKm(); - AnalysisPeriod[] ap = entry.getValue(); - QWD qwd = ap[periodNdx].getQSectorAverages()[sectorNdx]; - double dev = ap[periodNdx].getQSectorStdDev(sectorNdx); + AnalysisPeriod ap = entry.getValue(); + QWD qwd = ap.getQSectorAverages()[sectorNdx]; + double dev = ap.getQSectorStdDev(sectorNdx); logger.debug("std-dev: " + dev); if (qwd == null) { continue; @@ -227,11 +225,9 @@ boolean visible) { logger.debug("doAnalysisEventsOut"); - int index = aaf.getFacet().getIndex(); - int periodNdx = index >> 2; - KMIndex<AnalysisPeriod[]> kms = - (KMIndex<AnalysisPeriod[]>)aaf.getData(context); + KMIndex<QWD> kms = + (KMIndex<QWD>)aaf.getData(context); if(kms == null) { return; @@ -239,27 +235,15 @@ XYSeriesCollection col = new XYSeriesCollection(); - List<StyledXYSeries> series = new ArrayList<StyledXYSeries>(); - - for (KMIndex.Entry<AnalysisPeriod[]> entry: kms) { - double km = entry.getKm(); - AnalysisPeriod[] ap = entry.getValue(); - QWD[] qwds = ap[periodNdx].getQWDs(); + StyledXYSeries series = new StyledXYSeries(aaf.getFacetDescription(), false, doc); - String space = ""; - for (int i = 0; i < qwds.length; i++) { - if (series.size() <= i && qwds.length > i) { - StyledXYSeries s = new StyledXYSeries(aaf.getFacetDescription() + space, false, doc); - series.add (s); - } - StyledXYSeries s = series.get(i); - s.add(km, qwds[i].getDeltaW()); - space+= " "; - } + for (KMIndex.Entry<QWD> entry: kms) { + double km = entry.getKm(); + QWD qwd = entry.getValue(); + + series.add(km, qwd.getDeltaW()); } - for (StyledXYSeries s: series) { - col.addSeries(s); - } + col.addSeries(series); addAxisDataset(col, 0, visible); } @@ -272,8 +256,8 @@ { logger.debug("doReferenceEventOut"); - KMIndex<QWD[]> kms = - (KMIndex<QWD[]>)aaf.getData(context); + KMIndex<QWD> kms = + (KMIndex<QWD>)aaf.getData(context); if(kms == null) { return; @@ -281,26 +265,15 @@ XYSeriesCollection col = new XYSeriesCollection(); - List<StyledXYSeries> series = new ArrayList<StyledXYSeries>(); - - for (KMIndex.Entry<QWD[]> entry: kms) { - double km = entry.getKm(); - QWD[] qwds = entry.getValue(); + StyledXYSeries series = new StyledXYSeries(aaf.getFacetDescription(), false, doc); - String space = ""; - for (int i = 0; i < qwds.length; i++) { - if (series.size() <= i && qwds.length > i) { - StyledXYSeries s = new StyledXYSeries(aaf.getFacetDescription() + space, false, doc); - series.add (s); - } - StyledXYSeries s = series.get(i); - s.add(km, qwds[i].getDeltaW()); - space += " "; - } + for (KMIndex.Entry<QWD> entry: kms) { + double km = entry.getKm(); + QWD qwd = entry.getValue(); + + series.add(km, qwd.getDeltaW()); } - for (StyledXYSeries s: series) { - col.addSeries(s); - } + col.addSeries(series); addAxisDataset(col, 0, visible); }