dive4elements/river: flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java comparison

comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java @ 3841:5877d6900e34

Refactor GaugeTree folding for different states flys-client/trunk@5556 c6561f87-3c4e-4783-a992-168aeb5c3f6f

author	Bjoern Ricks <bjoern.ricks@intevation.de>
date	Fri, 21 Sep 2012 13:19:21 +0000
parents	cf64f54aa39c
children	44c1beb78ad1

comparison

equal deleted inserted replaced

-:cf64f54aa39c
+:5877d6900e34
 open();
 }
 }
 public void open() {
-ArrayList<Double> curvelocations = new ArrayList<Double>();
+ArrayList<Double> locations = new ArrayList<Double>();
 if (data != null && data.length > 0) {
 for (int i = 0; i < data.length; i++) {
 DataList dl = data[i];
 String state = dl.getState();
 GWT.log("GaugeTree - setData " + state);
-if (state.equals("state.winfo.distance") ||
+if (state.equals("state.winfo.location_distance")) {
-state.equals("state.winfo.distance_only") ||
-state.equals("state.winfo.location_distance")) {
 Double ldfrom = null;
 Double ldto = null;
 for (int j = dl.size()-1; j >= 0; --j) {
 Data d = dl.get(j);
 ldfrom = getDoubleValue(d);
 }
 else if (label.equals("ld_to")) {
 ldto = getDoubleValue(d);
 }
-else if (label.equals("ld_mode")) {
+else if (label.equals("ld_locations")) {
-GWT.log("GaugeTree - setData - ld_mode " + d.getStringValue());
+getLocationsFromData(locations, d);
-}
+openOnLocations(locations);
-}
+return;
+}
+}
 if (ldfrom != null) {
 openOnDistance(ldfrom, ldto);
 return;
 }
 }
-else if (state.equals("state.winfo.location")) {
+else if(state.equals("state.winfo.distance_only") ||
-ArrayList<Double> locations = new ArrayList<Double>();
+state.equals("state.winfo.distance")) {
+Double ldfrom = null;
+Double ldto = null;
 for (int j = dl.size()-1; j >= 0; --j) {
 Data d = dl.get(j);
 String label = d.getLabel();
-GWT.log("GaugeTree - setData - location label " +
+GWT.log("GaugeTree - setData - label " + label + " " + d.getStringValue());
-label + " " + d.getStringValue());
+if (label.equals("ld_from")) {
-if (label.equals("ld_locations")) {
+ldfrom = getDoubleValue(d);
-getLocations(locations, d.getItems());
+}
-}
+else if (label.equals("ld_to")) {
-}
+ldto = getDoubleValue(d);
+}
+}
+if (ldfrom != null) {
+openOnDistance(ldfrom, ldto);
+return;
+}
+}
+else if (state.equals("state.winfo.location")) {
+getLocations("ld_locations", locations, dl);
 openOnLocations(locations);
 return;
 }
 else if (state.equals("state.winfo.reference.curve.input.start")) {
-for (int j = dl.size()-1; j >= 0; --j) {
+getLocations("reference_startpoint", locations, dl);
-Data d = dl.get(j);
-String label = d.getLabel();
-if (label.equals("reference_startpoint")) {
-getLocations(curvelocations, d.getItems());
-}
-}
 }
 else if (state.equals("state.winfo.reference.curve.input.end")) {
-for (int j = dl.size()-1; j >= 0; --j) {
+getLocations("reference_endpoint", locations, dl);
-Data d = dl.get(j);
-String label = d.getLabel();
-if (label.equals("reference_endpoint")) {
-getLocations(curvelocations, d.getItems());
-}
-}
 }
 else if (state.equals("state.winfo.historicalq.reference_gauge")) {
 for (int j = dl.size()-1; j >= 0; --j) {
 Data d = dl.get(j);
 String label = d.getLabel();
 if (label.equals("reference_gauge")) {
 String tmp = d.getStringValue();
 if (tmp != null) {
 Integer gaugereference = Integer.valueOf(tmp);
 if (gaugereference != null) {
+//TODO
 }
 }
 }
 }
 }
 }
 }
-if (!curvelocations.isEmpty()) {
+if (!locations.isEmpty()) {
-openOnLocations(curvelocations);
+openOnLocations(locations);
 }
 else {
 openAll();
 }
 }
-private void getLocations(List<Double> locations, DataItem[] items) {
+private void getLocations(String labelname, List<Double> locations, DataList dl) {
+for (int j = dl.size()-1; j >= 0; --j) {
+Data d = dl.get(j);
+String label = d.getLabel();
+if (label.equals(labelname)) {
+getLocationsFromData(locations, d);
+}
+}
+}
+private void getLocationsFromData(List<Double> locations, Data data) {
+DataItem[] items = data.getItems();
 for (int k = 0; k < items.length; k++) {
 String tmp = items[k].getStringValue();
+GWT.log("GaugeTree - getLocationsFromData " + tmp);
 if (tmp != null) {
-Double value = Double.valueOf(tmp);
+if (tmp.contains(" ")) {
-if (value != null) {
+// string contains several values ...
-locations.add(value);
+String[] values = tmp.split(" ");
-}
+for(int i=0; i < values.length; i++) {
-}
+Double value = Double.valueOf(values[i]);
-}
+if (value != null) {
-}
+locations.add(value);
+}
+}
+}
+else {
+Double value = Double.valueOf(tmp);
+if (value != null) {
+locations.add(value);
+}
+}
+}
+}
+}
 private Double getDoubleValue(Data d) {
 String tmp = d.getStringValue();
 if (tmp != null) {
 return Double.valueOf(tmp);
 }
 if (gitem.getStart() >= start) {
 setstate = true;
 }
 }
 else {
-if ((gitem.getStart() >= start && gitem.getStart() <= end) ||
+GWT.log("GaugeTree - openOnDistance gitem " + gitem.getStart() + " " + gitem.getEnd());
-(gitem.getEnd() >= start && gitem.getEnd() <= end)) {
+if ((start >= gitem.getStart() && start <= gitem.getEnd()) ||
+(end >= gitem.getStart() && end <= gitem.getEnd()) ||
+(start <= gitem.getStart() && end >= gitem.getEnd())) {
 setstate = true;
 }
 }
 item.setState(setstate);
 }

Mercurial > dive4elements > river

comparison flys-client/src/main/java/de/intevation/flys/client/client/ui/GaugePanel.java @ 3841:5877d6900e34