Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/exports/CrossSectionGenerator.java @ 3228:698d09930329
Fix issue695 (labels of waterlines).
flys-artifacts/trunk@4856 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 03 Jul 2012 09:32:47 +0000 |
| parents | ed07dd55f487 |
| children | c27c4e06dd87 |
comparison
equal
deleted
inserted
replaced
| 3227:ed07dd55f487 | 3228:698d09930329 |
|---|---|
| 223 | 223 |
| 224 Lines.LineData lines = (Lines.LineData) o; | 224 Lines.LineData lines = (Lines.LineData) o; |
| 225 // DO NOT SORT DATA! This destroys the gaps indicated by NaNs. | 225 // DO NOT SORT DATA! This destroys the gaps indicated by NaNs. |
| 226 StyledXYSeries series = new StyledXYSeries(seriesName, false, theme); | 226 StyledXYSeries series = new StyledXYSeries(seriesName, false, theme); |
| 227 | 227 |
| 228 if (!ThemeUtil.parseShowLineLabel(theme)) { | |
| 229 series.setLabel(""); | |
| 230 } | |
| 228 if (ThemeUtil.parseShowWidth(theme)) { | 231 if (ThemeUtil.parseShowWidth(theme)) { |
| 229 NumberFormat nf = nf = Formatter.getMeterFormat(this.context); | 232 NumberFormat nf = nf = Formatter.getMeterFormat(this.context); |
| 230 series.setLabel(series.getLabel() + ", b=" + | 233 String labelAdd = "b=" + nf.format(lines.width) + "m"; |
| 231 nf.format(lines.width) + "m"); | 234 if (series.getLabel().equals("")) { |
| 235 series.setLabel(labelAdd); | |
| 236 } | |
| 237 else { | |
| 238 series.setLabel(series.getLabel() + ", " + labelAdd); | |
| 239 } | |
| 232 } | 240 } |
| 233 if (ThemeUtil.parseShowLevel(theme) && lines.points.length >0 | 241 if (ThemeUtil.parseShowLevel(theme) && lines.points.length >0 |
| 234 && lines.points[1].length > 0) { | 242 && lines.points[1].length > 0) { |
| 235 NumberFormat nf = nf = Formatter.getMeterFormat(this.context); | 243 NumberFormat nf = nf = Formatter.getMeterFormat(this.context); |
| 236 series.setLabel(series.getLabel() + ", W=" + | 244 String labelAdd = "W=" + nf.format(lines.points[1][0]) + "NN+m"; |
| 237 nf.format(lines.points[1][0]) + "NN+m"); | 245 if (series.getLabel().equals("")) { |
| 246 series.setLabel(labelAdd); | |
| 247 } | |
| 248 else { | |
| 249 series.setLabel(series.getLabel() + ", " + labelAdd); | |
| 250 } | |
| 238 } | 251 } |
| 239 if (ThemeUtil.parseShowMiddleHeight(theme) && lines.width != 0) { | 252 if (ThemeUtil.parseShowMiddleHeight(theme) && lines.width != 0) { |
| 240 NumberFormat nf = nf = Formatter.getMeterFormat(this.context); | 253 NumberFormat nf = nf = Formatter.getMeterFormat(this.context); |
| 241 series.setLabel(series.getLabel() + ",H=" + | 254 String labelAdd = "H=" + nf.format(lines.area / lines.width) + "m"; |
| 242 nf.format(lines.area / lines.width) + "m"); | |
| 243 // : " + lines.area + "/" + lines.width); | 255 // : " + lines.area + "/" + lines.width); |
| 256 if (series.getLabel().equals("")) { | |
| 257 series.setLabel(labelAdd); | |
| 258 } | |
| 259 else { | |
| 260 series.setLabel(series.getLabel() + ", " + labelAdd); | |
| 261 } | |
| 244 } | 262 } |
| 245 | 263 |
| 246 StyledSeriesBuilder.addPoints(series, lines.points, false); | 264 StyledSeriesBuilder.addPoints(series, lines.points, false); |
| 247 | 265 |
| 248 addAxisSeries(series, 0, visible); | 266 addAxisSeries(series, 0, visible); |