Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQAdapted.java @ 5110:ab2f1e0be311 dami
Merge branch default into dami
author | Andre Heinecke <aheinecke@intevation.de> |
---|---|
date | Wed, 27 Feb 2013 11:38:36 +0100 |
parents | a929d9a9fa1e |
children | 05eeedc5b156 |
comparison
equal
deleted
inserted
replaced
5109:357938c64967 | 5110:ab2f1e0be311 |
---|---|
56 } | 56 } |
57 } // class GaugeOrder | 57 } // class GaugeOrder |
58 | 58 |
59 public static final GaugeOrder GAUGE_UP = new GaugeOrder(true); | 59 public static final GaugeOrder GAUGE_UP = new GaugeOrder(true); |
60 public static final GaugeOrder GAUGE_DOWN = new GaugeOrder(false); | 60 public static final GaugeOrder GAUGE_DOWN = new GaugeOrder(false); |
61 | |
61 | 62 |
62 /** Trivial, empty constructor. */ | 63 /** Trivial, empty constructor. */ |
63 public WQAdapted() { | 64 public WQAdapted() { |
64 } | 65 } |
65 | 66 |
115 | 116 |
116 return new Element[] { w, q }; | 117 return new Element[] { w, q }; |
117 } | 118 } |
118 | 119 |
119 | 120 |
121 /** Create the items for input to the ranges per mode. */ | |
120 protected Element[] createValueItems( | 122 protected Element[] createValueItems( |
121 XMLUtils.ElementCreator cr, | 123 XMLUtils.ElementCreator cr, |
122 Artifact artifact, | 124 Artifact artifact, |
123 String name, | 125 String name, |
124 CallContext context) | 126 CallContext context) |
163 | 165 |
164 double[] mmQ = determineMinMaxQ(gauge, wst); | 166 double[] mmQ = determineMinMaxQ(gauge, wst); |
165 double[] mmW = gauge.determineMinMaxW(); | 167 double[] mmW = gauge.determineMinMaxW(); |
166 | 168 |
167 elements.add(createItem( | 169 elements.add(createItem( |
168 cr, new String[] { from + ";" + to, ""}, mmQ, mmW)); | 170 cr, new String[] { from + ";" + to, gauge.getName()}, mmQ, mmW)); |
169 } | 171 } |
170 } | 172 } |
171 else { | 173 else { |
172 Collections.sort(gauges, GAUGE_DOWN); | 174 Collections.sort(gauges, GAUGE_DOWN); |
173 rangeFrom = dist[1]; | 175 rangeFrom = dist[1]; |
184 | 186 |
185 double[] mmQ = determineMinMaxQ(gauge, wst); | 187 double[] mmQ = determineMinMaxQ(gauge, wst); |
186 double[] mmW = gauge.determineMinMaxW(); | 188 double[] mmW = gauge.determineMinMaxW(); |
187 | 189 |
188 elements.add(createItem( | 190 elements.add(createItem( |
189 cr, new String[] { to + ";" + from, ""}, mmQ, mmW)); | 191 cr, new String[] { to + ";" + from, gauge.getName()}, mmQ, mmW)); |
190 } | 192 } |
191 } | 193 } |
192 | 194 |
193 Element[] els = new Element[elements.size()]; | 195 Element[] els = new Element[elements.size()]; |
194 return elements.toArray(els); | 196 return elements.toArray(els); |
447 String[] parts = range.split(";"); | 449 String[] parts = range.split(";"); |
448 | 450 |
449 double lower = Double.parseDouble(parts[0]); | 451 double lower = Double.parseDouble(parts[0]); |
450 double upper = Double.parseDouble(parts[1]); | 452 double upper = Double.parseDouble(parts[1]); |
451 | 453 |
452 String[] values = parts[2].split(","); | 454 String[] values = parts[3].split(","); |
453 | 455 |
454 int num = values.length; | 456 int num = values.length; |
455 double[] res = new double[num]; | 457 double[] res = new double[num]; |
456 | 458 |
457 for (int i = 0; i < num; i++) { | 459 for (int i = 0; i < num; i++) { |