Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/GaugeDischargeCurveFacet.java @ 5086:4f65d833680f dami
Merge Default onto Dami branch.
Dami is now temporarily a public merge branch to fix problems
created by the merge.
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Mon, 25 Feb 2013 11:50:13 +0100 |
| parents | dbe9b7d6b80b |
| children |
comparison
equal
deleted
inserted
replaced
| 5085:4f46679e13d0 | 5086:4f65d833680f |
|---|---|
| 58 String name = gauge.getName(); | 58 String name = gauge.getName(); |
| 59 | 59 |
| 60 DischargeTables dt = new DischargeTables(river, name); | 60 DischargeTables dt = new DischargeTables(river, name); |
| 61 | 61 |
| 62 Map<String, double [][]> map = dt.getValues( | 62 Map<String, double [][]> map = dt.getValues( |
| 63 DischargeTables.HISTORICAL_SCALE); | 63 DischargeTables.MASTER_SCALE); |
| 64 | 64 |
| 65 double [][] values = map.get(name); | 65 double [][] values = map.get(name); |
| 66 if (values == null) { | 66 if (values == null) { |
| 67 return null; | 67 return null; |
| 68 } | 68 } |