Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/LongitudinalSectionGenerator.java @ 7718:bf87349bf456
Fix compilation of the AreaData change.
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Fri, 20 Dec 2013 15:10:08 +0100 |
| parents | 4bbd222e6b7f |
| children | e4606eae8ea5 |
comparison
equal
deleted
inserted
replaced
| 7717:dce7b9867213 | 7718:bf87349bf456 |
|---|---|
| 470 XYSeries down = null; | 470 XYSeries down = null; |
| 471 | 471 |
| 472 if (data.getUpperData() != null) { | 472 if (data.getUpperData() != null) { |
| 473 up = new StyledXYSeries(seriesName, false, theme); | 473 up = new StyledXYSeries(seriesName, false, theme); |
| 474 if (data.getUpperData() instanceof WQKms) { | 474 if (data.getUpperData() instanceof WQKms) { |
| 475 if (FacetTypes.IS.Q(data.getRootFacetName())) { | 475 if (FacetTypes.IS.Q(data.getUpperFacetName())) { |
| 476 StyledSeriesBuilder.addPointsKmQ(up, (WQKms) data.getUpperData()); | 476 StyledSeriesBuilder.addPointsKmQ(up, (WQKms) data.getUpperData()); |
| 477 } | 477 } |
| 478 else { | 478 else { |
| 479 StyledSeriesBuilder.addPoints(up, (WKms) data.getUpperData()); | 479 StyledSeriesBuilder.addPoints(up, (WKms) data.getUpperData()); |
| 480 } | 480 } |
| 499 if (data.getLowerData() != null) { | 499 if (data.getLowerData() != null) { |
| 500 // TODO: Sort this out: when the two series have the same name, | 500 // TODO: Sort this out: when the two series have the same name, |
| 501 // the renderer (or anything in between) will not work correctly. | 501 // the renderer (or anything in between) will not work correctly. |
| 502 down = new StyledXYSeries(seriesName + " ", false, theme); | 502 down = new StyledXYSeries(seriesName + " ", false, theme); |
| 503 if (data.getLowerData() instanceof WQKms) { | 503 if (data.getLowerData() instanceof WQKms) { |
| 504 if (FacetTypes.IS.Q(data.getRootFacetName())) { | 504 if (FacetTypes.IS.Q(data.getLowerFacetName())) { |
| 505 StyledSeriesBuilder.addPointsKmQ(down, (WQKms) data.getLowerData()); | 505 StyledSeriesBuilder.addPointsKmQ(down, (WQKms) data.getLowerData()); |
| 506 } | 506 } |
| 507 else { | 507 else { |
| 508 StyledSeriesBuilder.addPoints(down, (WQKms) data.getLowerData()); | 508 StyledSeriesBuilder.addPoints(down, (WQKms) data.getLowerData()); |
| 509 } | 509 } |
| 543 } | 543 } |
| 544 area.addSeries(up); | 544 area.addSeries(up); |
| 545 area.addSeries(down); | 545 area.addSeries(down); |
| 546 } | 546 } |
| 547 // Add area to the respective axis. | 547 // Add area to the respective axis. |
| 548 addAreaSeries(area, axisIdxForFacet(data.getRootFacetName()), visible); | 548 String facetAxisName = data.getUpperFacetName() == null |
| 549 ? data.getLowerFacetName() | |
| 550 : data.getUpperFacetName(); | |
| 551 addAreaSeries(area, axisIdxForFacet(facetAxisName), visible); | |
| 549 } | 552 } |
| 550 } | 553 } |
| 551 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 554 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |