Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/Calculation4.java @ 5379:61bf64b102bc mapgenfix
Merge with default branch
| author | Christian Lins <christian.lins@intevation.de> |
|---|---|
| date | Fri, 22 Mar 2013 11:25:54 +0100 |
| parents | fc0cdcae8f07 |
| children |
comparison
equal
deleted
inserted
replaced
| 5175:cfc5540a4eec | 5379:61bf64b102bc |
|---|---|
| 321 columns[i].getQRangeTree().new QuickQFinder(); | 321 columns[i].getQRangeTree().new QuickQFinder(); |
| 322 | 322 |
| 323 int numProblemsBefore = numProblems(); | 323 int numProblemsBefore = numProblems(); |
| 324 double [] qs = qf.findQs(kms, this); | 324 double [] qs = qf.findQs(kms, this); |
| 325 | 325 |
| 326 // TODO: i18n | 326 String name = columns[i].getName(); |
| 327 String name = "Umh\u00fcllende " + columns[i].getName(); | |
| 328 | |
| 329 ConstantWQKms infolding = new ConstantWQKms(kms, qs, ws, name); | 327 ConstantWQKms infolding = new ConstantWQKms(kms, qs, ws, name); |
| 330 | 328 |
| 331 if (numProblems() > numProblemsBefore) { | 329 if (numProblems() > numProblemsBefore) { |
| 332 infolding.removeNaNs(); | 330 infolding.removeNaNs(); |
| 333 } | 331 } |
| 334 | 332 |
| 335 infoldings.add(infolding); | 333 infoldings.add(infolding); |
| 336 } | 334 } |
| 337 | 335 |
| 336 for (int i = 0; i < infoldings.size(); i++) { | |
| 337 String name = infoldings.get(i).getName(); | |
| 338 // TODO: i18n | |
| 339 if (i == 0) { | |
| 340 infoldings.get(i).setName("untere Umh\u00fcllende " + name); | |
| 341 } | |
| 342 else if (i == infoldings.size() - 1) { | |
| 343 infoldings.get(i).setName("obere Umh\u00fcllende " + name); | |
| 344 } | |
| 345 else { | |
| 346 infoldings.get(i).setName("geschnitten " + name); | |
| 347 } | |
| 348 } | |
| 338 return infoldings.toArray(new ConstantWQKms[infoldings.size()]); | 349 return infoldings.toArray(new ConstantWQKms[infoldings.size()]); |
| 339 } | 350 } |
| 340 | 351 |
| 341 // TODO: issue1109/2, merge with FixRealizingCalculation | 352 // TODO: issue1109/2, merge with FixRealizingCalculation |
| 342 protected String createName(int index) { | 353 protected String createName(int index) { |