Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FlowVelocityCalculation.java @ 4432:e8a4d2fd25cc
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Wed, 07 Nov 2012 09:47:44 +0100 |
| parents | a4930c43b806 |
| children | 5b8919ef601d |
comparison
equal
deleted
inserted
replaced
| 4431:83fe6eeba83a | 4432:e8a4d2fd25cc |
|---|---|
| 128 } | 128 } |
| 129 | 129 |
| 130 DischargeZone zone = model.getDischargeZone(); | 130 DischargeZone zone = model.getDischargeZone(); |
| 131 String lo = zone.getLowerDischarge(); | 131 String lo = zone.getLowerDischarge(); |
| 132 String hi = zone.getUpperDischarge(); | 132 String hi = zone.getUpperDischarge(); |
| 133 // TODO make discharge available, should be shown in diagram. | |
| 133 | 134 |
| 134 if (lo.equals(hi)) { | 135 if (lo.equals(hi)) { |
| 135 data.setZone(lo); | 136 data.setZone(lo); |
| 136 } | 137 } |
| 137 else { | 138 else { |
| 139 } | 140 } |
| 140 } | 141 } |
| 141 | 142 |
| 142 | 143 |
| 143 protected CalculationResult buildCalculationResult( | 144 protected CalculationResult buildCalculationResult( |
| 144 FlowVelocityAccess access, | 145 FlowVelocityAccess access, |
| 145 List<FlowVelocityModel> models | 146 List<FlowVelocityModel> models |
| 146 ) { | 147 ) { |
| 147 double kmLo = access.getLowerKM(); | 148 double kmLo = access.getLowerKM(); |
| 148 double kmHi = access.getUpperKM(); | 149 double kmHi = access.getUpperKM(); |
| 149 | 150 |