Mercurial > dive4elements > river
diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java @ 2715:250a370c377d
Added chart generator for middle bed height charts.
flys-artifacts/trunk@4441 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 18 May 2012 11:58:38 +0000 |
parents | b60751cfdd6c |
children | b888c5eb65b3 |
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java Fri May 18 10:51:04 2012 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/MiddleBedHeightCalculation.java Fri May 18 11:58:38 2012 +0000 @@ -92,12 +92,14 @@ ) { logger.info("MiddleBedHeightCalculation.buildCalculationResult"); - int size = singles.size() + epochs.size(); + int size = singles.size() + epochs.size(); + double kmLo = artifact.getDataAsDouble("ld_from"); + double kmHi = artifact.getDataAsDouble("ld_to"); List<MiddleBedHeightData> data = new ArrayList<MiddleBedHeightData>(); for (BedHeightSingle single: singles) { - MiddleBedHeightData d = prepareSingleData(single); + MiddleBedHeightData d = prepareSingleData(single, kmLo, kmHi); if (d != null) { data.add(d); @@ -105,7 +107,7 @@ } for (BedHeightEpoch epoch: epochs) { - MiddleBedHeightData d = prepareEpochData(epoch); + MiddleBedHeightData d = prepareEpochData(epoch, kmLo, kmHi); if (d != null) { data.add(d); @@ -119,10 +121,15 @@ } - protected MiddleBedHeightData prepareSingleData(BedHeightSingle single) { + protected MiddleBedHeightData prepareSingleData( + BedHeightSingle single, + double kmLo, + double kmHi + ) { logger.debug("Prepare data for single: " + single.getDescription()); - List<BedHeightSingleValue> values = single.getValues(); + List<BedHeightSingleValue> values = + BedHeightSingleValue.getBedHeightSingleValues(single, kmLo, kmHi); MiddleBedHeightData data = new MiddleBedHeightData( single.getYear(), @@ -145,12 +152,17 @@ } - protected MiddleBedHeightData prepareEpochData(BedHeightEpoch epoch) { + protected MiddleBedHeightData prepareEpochData( + BedHeightEpoch epoch, + double kmLo, + double kmHi + ) { logger.debug("Prepare data for epoch: " + epoch.getDescription()); TimeInterval ti = epoch.getTimeInterval(); - List<BedHeightEpochValue> values = epoch.getValues(); + List<BedHeightEpochValue> values = + BedHeightEpochValue.getBedHeightEpochValues(epoch, kmLo, kmHi); MiddleBedHeightData data = new MiddleBedHeightData( DateUtils.getYearFromDate(ti.getStartTime()),