Mercurial > dive4elements > river
diff flys-client/src/main/java/de/intevation/flys/client/client/ui/WQSimpleArrayPanel.java @ 1595:e53d773e6992
Display inserted W/Q values in WQSimpleArrayPanel.
flys-client/trunk@3908 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Fri, 03 Feb 2012 15:27:46 +0000 |
parents | 8e5c5c70c586 |
children | 070321cf17e1 |
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQSimpleArrayPanel.java Fri Feb 03 15:04:12 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQSimpleArrayPanel.java Fri Feb 03 15:27:46 2012 +0000 @@ -5,6 +5,7 @@ import java.util.List; import com.google.gwt.core.client.GWT; +import com.google.gwt.i18n.client.NumberFormat; import com.smartgwt.client.widgets.Canvas; import com.smartgwt.client.widgets.Label; @@ -22,7 +23,7 @@ import de.intevation.flys.client.shared.model.DataList; import de.intevation.flys.client.shared.model.DefaultData; import de.intevation.flys.client.shared.model.DefaultDataItem; -import de.intevation.flys.client.shared.model.IntegerArrayData; +import de.intevation.flys.client.shared.model.DoubleArrayData; import de.intevation.flys.client.shared.model.IntegerOptionsData; import de.intevation.flys.client.client.FLYSConstants; @@ -71,7 +72,7 @@ @Override public Canvas createOld(DataList dataList) { IntegerOptionsData modeData = findOptionsData(dataList); - IntegerArrayData valuesData = findValuesData(dataList); + DoubleArrayData valuesData = findValuesData(dataList); DataItem[] modeItems = modeData.getItems(); DataItem[] valuesItems = valuesData.getItems(); @@ -87,8 +88,7 @@ mode.setHeight(20); mode.setWidth(150); - Label values = new Label(valuesItems[0].getLabel()); - values.setHeight(20); + Canvas values = createOldValues(modeData, valuesData); values.setWidth(150); valueContainer.addMember(mode); @@ -152,14 +152,35 @@ } - protected IntegerArrayData findValuesData(DataList dataList) { - IntegerArrayData data = null; + protected Canvas createOldValues( + IntegerOptionsData modeData, + DoubleArrayData valuesData + ) { + NumberFormat nf = NumberFormat.getDecimalFormat(); + + DataItem[] items = modeData.getItems(); + String unit = items[0].getStringValue().equals("0") ? "cm" : "q³/s"; + + VLayout layout = new VLayout(); + + for (double val: valuesData.getValues()) { + Label tmp = new Label(nf.format(val) + " " + unit); + tmp.setHeight(20); + layout.addMember(tmp); + } + + return layout; + } + + + protected DoubleArrayData findValuesData(DataList dataList) { + DoubleArrayData data = null; for (int i = 0, n = dataList.size(); i < n; i++) { Data tmp = dataList.get(i); - if (tmp instanceof IntegerArrayData) { - return (IntegerArrayData) tmp; + if (tmp instanceof DoubleArrayData) { + return (DoubleArrayData) tmp; } } @@ -217,7 +238,7 @@ protected Canvas createValuesForm(DataList dataList) { - IntegerArrayData data = findValuesData(dataList); + DoubleArrayData data = findValuesData(dataList); if (data == null) { return new Label("NO VALUES GIVEN!");