Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WQInputPanel.java @ 8624:4f702ea1fd3a
Fix unit displayed in WFree calculation
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 26 Mar 2015 11:46:03 +0100 |
| parents | 685c2be0541c |
| children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
| 8623:289486a43be8 | 8624:4f702ea1fd3a |
|---|---|
| 342 | 342 |
| 343 if (!isRange) { | 343 if (!isRange) { |
| 344 DataItem[] single = dSingle.getItems(); | 344 DataItem[] single = dSingle.getItems(); |
| 345 | 345 |
| 346 vLabel = !isQMode | 346 vLabel = !isQMode |
| 347 ? createWString(single[0]) | 347 ? createWString(single[0], isFree) |
| 348 : createQString(single[0]); | 348 : createQString(single[0]); |
| 349 } | 349 } |
| 350 else { | 350 else { |
| 351 DataItem[] from = dFrom.getItems(); | 351 DataItem[] from = dFrom.getItems(); |
| 352 DataItem[] to = dTo.getItems(); | 352 DataItem[] to = dTo.getItems(); |
| 597 | 597 |
| 598 return v; | 598 return v; |
| 599 } | 599 } |
| 600 | 600 |
| 601 | 601 |
| 602 protected VLayout createWString(DataItem single) { | 602 protected VLayout createWString(DataItem single, boolean isFree) { |
| 603 String label = single.getLabel().trim(); | 603 String label = single.getLabel().trim(); |
| 604 String[] cols = label.split(";"); | 604 String[] cols = label.split(";"); |
| 605 | 605 |
| 606 VLayout v = new VLayout(); | 606 VLayout v = new VLayout(); |
| 607 | 607 |
| 608 for (String col: cols) { | 608 for (String col: cols) { |
| 609 Label l = new Label(col + " " + MESSAGE.unitWSingle()); | 609 Label l = new Label(col + " " + (isFree ? MESSAGE.unitWFree() : MESSAGE.unitWSingle())); |
| 610 l.setHeight(20); | 610 l.setHeight(20); |
| 611 | 611 |
| 612 v.addMember(l); | 612 v.addMember(l); |
| 613 } | 613 } |
| 614 | 614 |
| 1324 if (!isRange) { | 1324 if (!isRange) { |
| 1325 // Single W mode | 1325 // Single W mode |
| 1326 double[] values = getSingleWFree(); | 1326 double[] values = getSingleWFree(); |
| 1327 | 1327 |
| 1328 wFreeArrayPanel = new DoubleArrayPanel( | 1328 wFreeArrayPanel = new DoubleArrayPanel( |
| 1329 MESSAGE.unitWSingle(), values, this); | 1329 MESSAGE.unitWFree(), values, this); |
| 1330 | 1330 |
| 1331 container.addMember(wFreeArrayPanel); | 1331 container.addMember(wFreeArrayPanel); |
| 1332 } | 1332 } |
| 1333 else { | 1333 else { |
| 1334 // Range W mode | 1334 // Range W mode |