Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 7524:25d890e3eb69 | 7525:6650485c2c9b |
|---|---|
| 426 } | 426 } |
| 427 | 427 |
| 428 if (hasProblems()) { | 428 if (hasProblems()) { |
| 429 return new CalculationResult(this); | 429 return new CalculationResult(this); |
| 430 } | 430 } |
| 431 | 431 CalculationResult result = innerCalculate(overview, func); |
| 432 return innerCalculate(overview, func); | 432 |
| 433 if (result != null) { | |
| 434 // Workaraound to deal with same dates in data set | |
| 435 Object o = result.getData(); | |
| 436 if (o instanceof FixResult) { | |
| 437 FixResult fr = (FixResult)o; | |
| 438 fr.makeReferenceEventsDatesUnique(); | |
| 439 fr.remapReferenceIndicesToRank(); | |
| 440 } | |
| 441 } | |
| 442 | |
| 443 return result; | |
| 433 } | 444 } |
| 434 | 445 |
| 435 protected abstract CalculationResult innerCalculate( | 446 protected abstract CalculationResult innerCalculate( |
| 436 FixingsOverview overview, | 447 FixingsOverview overview, |
| 437 Function function | 448 Function function |