Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixCalculation.java @ 7525:6650485c2c9b
Part fix for flys/issue1585: Use result from fitting to display interpolated W/Q points, too. TODO: Draw interpolated as circles.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 06 Nov 2013 19:12:46 +0100 |
| parents | 83bb52fa0c32 |
| children | 850ce16034e9 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixCalculation.java Wed Nov 06 12:07:48 2013 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixCalculation.java Wed Nov 06 19:12:46 2013 +0100 @@ -428,8 +428,19 @@ if (hasProblems()) { return new CalculationResult(this); } + CalculationResult result = innerCalculate(overview, func); - return innerCalculate(overview, func); + if (result != null) { + // Workaraound to deal with same dates in data set + Object o = result.getData(); + if (o instanceof FixResult) { + FixResult fr = (FixResult)o; + fr.makeReferenceEventsDatesUnique(); + fr.remapReferenceIndicesToRank(); + } + } + + return result; } protected abstract CalculationResult innerCalculate(