Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoad.java @ 6374:48e92ff57f23
SedimentLoad*: Set range to fraction/fractions values.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Thu, 20 Jun 2013 09:06:23 +0200 |
parents | af13ceeba52a |
children | 8d6f23243d1d |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoad.java Wed Jun 19 16:53:27 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoad.java Thu Jun 20 09:06:23 2013 +0200 @@ -13,6 +13,8 @@ import java.util.Set; import org.dive4elements.river.artifacts.model.NamedObjectImpl; +import org.dive4elements.river.artifacts.model.Range; + /** Gives access to Fractions (at kms). */ public class SedimentLoad @@ -89,68 +91,79 @@ return kms.get(km); } - public void setCoarse(double km, double coarse) { + public void setCoarse(double km, double coarse, Range range) { if (kms.containsKey(km)) { kms.get(km).setCoarse(coarse); } else { SedimentLoadFraction f = new SedimentLoadFraction(); f.setCoarse(coarse); - kms.put(km, f); - } - } - - public void setFineMiddle(double km, double fine_middle) { - if (kms.containsKey(km)) { - kms.get(km).setFine_middle(fine_middle); - } - else { - SedimentLoadFraction f = new SedimentLoadFraction(); - f.setFine_middle(fine_middle); - kms.put(km, f); - } - } - - public void setSand(double km, double sand) { - if (kms.containsKey(km)) { - kms.get(km).setSand(sand); - } - else { - SedimentLoadFraction f = new SedimentLoadFraction(); - f.setSand(sand); + f.setCoarseRange(range); kms.put(km, f); } } - public void setSuspSand(double km, double susp_sand) { + public void setFineMiddle(double km, double fine_middle, Range range) { if (kms.containsKey(km)) { - kms.get(km).setSusp_sand(susp_sand); + kms.get(km).setFine_middle(fine_middle); + kms.get(km).setFineMiddleRange(range); } else { SedimentLoadFraction f = new SedimentLoadFraction(); - f.setSusp_sand(susp_sand); + f.setFine_middle(fine_middle); + f.setFineMiddleRange(range); kms.put(km, f); } } - public void setSuspSandBed(double km, double susp_sand_bed) { + public void setSand(double km, double sand, Range range) { + if (kms.containsKey(km)) { + kms.get(km).setSand(sand); + kms.get(km).setSandRange(range); + } + else { + SedimentLoadFraction f = new SedimentLoadFraction(); + f.setSand(sand); + f.setSandRange(range); + kms.put(km, f); + } + } + + public void setSuspSand(double km, double susp_sand, Range range) { + if (kms.containsKey(km)) { + kms.get(km).setSusp_sand(susp_sand); + kms.get(km).setSuspSandRange(range); + } + else { + SedimentLoadFraction f = new SedimentLoadFraction(); + f.setSusp_sand(susp_sand); + f.setSuspSandRange(range); + kms.put(km, f); + } + } + + public void setSuspSandBed(double km, double susp_sand_bed, Range range) { if (kms.containsKey(km)) { kms.get(km).setSusp_sand_bed(susp_sand_bed); + kms.get(km).setSuspSandBedRange(range); } else { SedimentLoadFraction f = new SedimentLoadFraction(); f.setSusp_sand_bed(susp_sand_bed); + f.setSuspSandBedRange(range); kms.put(km, f); } } - public void setSuspSediment(double km, double susp_sediment) { + public void setSuspSediment(double km, double susp_sediment, Range range) { if (kms.containsKey(km)) { kms.get(km).setSusp_sediment(susp_sediment); + kms.get(km).setSuspSedimentRange(range); } else { SedimentLoadFraction f = new SedimentLoadFraction(); f.setSusp_sediment(susp_sediment); + f.setSuspSedimentRange(range); kms.put(km, f); } } @@ -166,13 +179,15 @@ } } - public void setTotal(double km, double total) { + public void setTotal(double km, double total, Range range) { if (kms.containsKey(km)) { kms.get(km).setTotal(total); + kms.get(km).setTotalRange(range); } else { SedimentLoadFraction f = new SedimentLoadFraction(); f.setTotal(total); + f.setTotalRange(range); kms.put(km, f); } }