Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java @ 8422:96bf5135cd0e
Bedheight differences exports sounding width and data gap for minuend and subtrahend.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Fri, 17 Oct 2014 13:34:08 +0200 |
parents | 8a14605fb64a |
children | 706668b19b04 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java Fri Oct 17 13:17:12 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java Fri Oct 17 13:34:08 2014 +0200 @@ -16,8 +16,10 @@ extends BedDifferencesResult { protected TDoubleArrayList diffsPerYear; - protected TDoubleArrayList dataGap; - protected TDoubleArrayList soundingWidth; + protected TDoubleArrayList dataGap1; + protected TDoubleArrayList dataGap2; + protected TDoubleArrayList soundingWidth1; + protected TDoubleArrayList soundingWidth2; //protected TDoubleArrayList morphWidth1; //protected TDoubleArrayList morphWidth2; protected Integer start; @@ -30,8 +32,10 @@ public BedDiffYearResult () { super(); this.diffsPerYear = new TDoubleArrayList(); - this.dataGap = new TDoubleArrayList(); - this.soundingWidth = new TDoubleArrayList(); + this.dataGap1 = new TDoubleArrayList(); + this.dataGap2 = new TDoubleArrayList(); + this.soundingWidth1 = new TDoubleArrayList(); + this.soundingWidth2 = new TDoubleArrayList(); //this.morphWidth1 = new TDoubleArrayList(); //this.morphWidth2 = new TDoubleArrayList(); } @@ -50,9 +54,11 @@ TDoubleArrayList heights2, //TDoubleArrayList morphWidth1, //TDoubleArrayList morphWidth2, - TDoubleArrayList soundingWidth, + TDoubleArrayList soundingWidth1, + TDoubleArrayList soundingWidth2, TDoubleArrayList diffsPerYear, - TDoubleArrayList dataGap, + TDoubleArrayList dataGap1, + TDoubleArrayList dataGap2, Integer start, Integer end, String nameFirst, @@ -62,8 +68,10 @@ ) { super(kms, differences, heights1, heights2); this.diffsPerYear = diffsPerYear; - this.dataGap = dataGap; - this.soundingWidth = soundingWidth; + this.dataGap1 = dataGap1; + this.dataGap2 = dataGap2; + this.soundingWidth1 = soundingWidth1; + this.soundingWidth2 = soundingWidth2; //this.morphWidth1 = morphWidth1; //this.morphWidth2 = morphWidth2; this.start = start; @@ -78,8 +86,12 @@ return this.diffsPerYear; } - public TDoubleArrayList getDataGap() { - return this.dataGap; + public TDoubleArrayList getDataGap1() { + return this.dataGap1; + } + + public TDoubleArrayList getDataGap2() { + return this.dataGap2; } /* @@ -92,8 +104,12 @@ } */ - public TDoubleArrayList getSoundingWidth() { - return this.soundingWidth; + public TDoubleArrayList getSoundingWidth1() { + return this.soundingWidth1; + } + + public TDoubleArrayList getSoundingWidth2() { + return this.soundingWidth2; } public Integer getStart() { @@ -142,8 +158,12 @@ } */ - public void addSoundingWidth(double value) { - this.soundingWidth.add(value); + public void addSoundingWidth1(double value) { + this.soundingWidth1.add(value); + } + + public void addSoundingWidth2(double value) { + this.soundingWidth2.add(value); } public void addBedHeights(double value) { @@ -166,10 +186,31 @@ } */ - public double[][] getSoundingWidthData() { + public double[][] getSoundingWidth1Data() { return new double[][] { kms.toNativeArray(), - soundingWidth.toNativeArray() + soundingWidth1.toNativeArray() + }; + } + + public double[][] getSoundingWidth2Data() { + return new double[][] { + kms.toNativeArray(), + soundingWidth2.toNativeArray() + }; + } + + public double[][] getDataGap1Data() { + return new double[][] { + kms.toNativeArray(), + dataGap1.toNativeArray() + }; + } + + public double[][] getDataGap2Data() { + return new double[][] { + kms.toNativeArray(), + dataGap2.toNativeArray() }; }