Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.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 | 5f38d1c39ebd |
comparison
equal
deleted
inserted
replaced
| 5085:4f46679e13d0 | 5086:4f65d833680f |
|---|---|
| 127 "no discharge table for gauge '" + gaugeName + "'"); | 127 "no discharge table for gauge '" + gaugeName + "'"); |
| 128 continue; | 128 continue; |
| 129 } | 129 } |
| 130 | 130 |
| 131 // TODO: Filter by time interval | 131 // TODO: Filter by time interval |
| 132 DischargeTable table = tables.get(0); | 132 DischargeTable table = null; |
| 133 | 133 for (DischargeTable dt : tables) { |
| 134 if (dt.getKind() == 0) { | |
| 135 table = dt; | |
| 136 break; | |
| 137 } | |
| 138 } | |
| 139 if (table == null) { | |
| 140 table = tables.get(0); | |
| 141 } | |
| 134 double [][] vs = loadDischargeTableValues(table, scale); | 142 double [][] vs = loadDischargeTableValues(table, scale); |
| 135 | 143 |
| 136 values.put(gaugeName, vs); | 144 values.put(gaugeName, vs); |
| 137 } | 145 } |
| 138 | 146 |