Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java @ 8532:73a4c3c202e5
(issue1051) Use a list of single years in SedimentLoadYear mode
Instead of a range you can now select multiple distinct years
in the sedimentload calculation.
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Wed, 11 Feb 2015 18:00:48 +0100 |
| parents | 155a886ab19b |
| children | 6b68777aaeab |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java Wed Feb 11 12:41:51 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataCalculation.java Wed Feb 11 18:00:48 2015 +0100 @@ -176,7 +176,7 @@ Integer sqTiId = access.getSQTiId(); if (yearEpoch.equals("year")) { - years = access.getPeriod(); + years = access.getYears(); } else if (yearEpoch.equals("epoch") || yearEpoch.equals("off_epoch")) { epochs = access.getEpochs(); @@ -240,10 +240,8 @@ SedimentDensity sd = getSedimentDensity(); - int min = Math.min(years[0], years[1]); - int max = Math.max(years[0], years[1]); - - for (int year = min; year <= max; ++year) { + for (int i = 0; i < years.length; i++) { + int year = years[i]; Value.Filter filter = new And(notEpochs) .add(new TimeRangeIntersects(year)).add(sqTiFilter); String period = Integer.toString(year);