changeset 6089:0c3301fe23bd

towards issue1061: Store names of original BedHeights in the BedDiffYearResult.
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Fri, 24 May 2013 11:39:35 +0200
parents 127cc609c12b
children 5239d96f84c2
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java
diffstat 2 files changed, 20 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Fri May 24 12:22:05 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java	Fri May 24 11:39:35 2013 +0200
@@ -190,6 +190,8 @@
             absolute,
             gap,
             s1.getYear(),
-            s2.getYear());
+            s2.getYear(),
+            s1.getName(),
+            s2.getName());
     }
 }
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java	Fri May 24 12:22:05 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearResult.java	Fri May 24 11:39:35 2013 +0200
@@ -20,6 +20,8 @@
     protected TDoubleArrayList morphWidth;
     protected int start;
     protected int end;
+    protected String nameFirst;
+    protected String nameSecond;
 
     public BedDiffYearResult () {
         super();
@@ -39,7 +41,9 @@
         TDoubleArrayList bedHeights,
         TDoubleArrayList dataGap,
         int start,
-        int end
+        int end,
+        String nameFirst,
+        String nameSecond
     ) {
         super(kms, differences, heights1, heights2);
         this.bedHeights = bedHeights;
@@ -47,6 +51,8 @@
         this.morphWidth = morphWidth;
         this.start = start;
         this.end = end;
+        this.nameFirst = nameFirst;
+        this.nameSecond = nameSecond;
     }
 
     public TDoubleArrayList getBedHeights() {
@@ -77,6 +83,16 @@
         return this.end;
     }
 
+    /** Get name of the first BedHeight (minuend). */
+    public String getNameFirst() {
+        return this.nameFirst;
+    }
+
+    /** Get name of the second BedHeight (subtrahend). */
+    public String getNameSecond() {
+        return this.nameFirst;
+    }
+
     public void addMorphWidth(double value) {
         this.morphWidth.add(value);
     }

http://dive4elements.wald.intevation.org