Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/services/DischargeTablesOverview.java @ 6301:20a32dbdbb59
Remove discharge table scaling but add reference system to W
- Discharge_Tables are now always W[cm] Q[m³] no need for
special case handling depending on historical / master tables
- W now has a referenceSystem value that can be CENTIMETER_AT_GAUGE or
METER_OVER_REFPOINT. The default is METER_OVER_REFPOINT as this is
the case for everything except the objects created from discharge tables
Known issue: WINFO input validation is currently broken as it still scales
the user input.
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Wed, 12 Jun 2013 10:54:27 +0200 |
| parents | af13ceeba52a |
| children | fe7e9da6312a |
comparison
equal
deleted
inserted
replaced
| 6300:0711ce5ca701 | 6301:20a32dbdbb59 |
|---|---|
| 145 protected XYSeries createSeries(CallMeta callMeta, DischargeTable dt) | 145 protected XYSeries createSeries(CallMeta callMeta, DischargeTable dt) |
| 146 throws IllegalArgumentException { | 146 throws IllegalArgumentException { |
| 147 | 147 |
| 148 double[][] xy = null; | 148 double[][] xy = null; |
| 149 | 149 |
| 150 if (dt.getKind() == DischargeTables.MASTER) { | 150 xy = DischargeTables.loadDischargeTableValues(dt); |
| 151 xy = DischargeTables.loadDischargeTableValues(dt, | |
| 152 DischargeTables.MASTER_SCALE); | |
| 153 } | |
| 154 else { | |
| 155 xy = DischargeTables.loadDischargeTableValues(dt, | |
| 156 DischargeTables.HISTORICAL_SCALE); | |
| 157 } | |
| 158 | 151 |
| 159 XYSeries series = new XYSeries(createSeriesTitle(callMeta, dt), false); | 152 XYSeries series = new XYSeries(createSeriesTitle(callMeta, dt), false); |
| 160 for (int i = 0, n = xy[0].length; i < n; i++) { | 153 for (int i = 0, n = xy[0].length; i < n; i++) { |
| 161 series.add(xy[0][i], xy[1][i]); | 154 series.add(xy[0][i], xy[1][i]); |
| 162 } | 155 } |