Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/jfree/StyledAreaSeriesCollection.java @ 7119:988dde49ae65
Fix area label rendering.
Previously the showarealabel setting was neither parsed nor
used to decide if the arealabel should be drawn.
It is mostly off but enabled for Cross Sections. It is now
also shown in the style editors in case someone got used to it ;)
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Tue, 24 Sep 2013 18:13:51 +0200 |
| parents | 819481cc9195 |
| children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
| 7118:4605d6ca4ee9 | 7119:988dde49ae65 |
|---|---|
| 68 ) { | 68 ) { |
| 69 applyFillColor(renderer); | 69 applyFillColor(renderer); |
| 70 applyShowShape(renderer); | 70 applyShowShape(renderer); |
| 71 applyOutlineColor(renderer); | 71 applyOutlineColor(renderer); |
| 72 applyOutlineStyle(renderer); | 72 applyOutlineStyle(renderer); |
| 73 applyShowArea(renderer); | 73 applyShowAreaLabel(renderer); |
| 74 if (mode == FILL_MODE.UNDER) { | 74 if (mode == FILL_MODE.UNDER) { |
| 75 renderer.setAreaCalculationMode(StableXYDifferenceRenderer.CALCULATE_NEGATIVE_AREA); | 75 renderer.setAreaCalculationMode(StableXYDifferenceRenderer.CALCULATE_NEGATIVE_AREA); |
| 76 } | 76 } |
| 77 else if (mode == FILL_MODE.ABOVE) { | 77 else if (mode == FILL_MODE.ABOVE) { |
| 78 renderer.setAreaCalculationMode(StableXYDifferenceRenderer.CALCULATE_POSITIVE_AREA); | 78 renderer.setAreaCalculationMode(StableXYDifferenceRenderer.CALCULATE_POSITIVE_AREA); |
| 137 // int size = theme.parseLineWidth(); | 137 // int size = theme.parseLineWidth(); |
| 138 // XXX: Why is this not set? | 138 // XXX: Why is this not set? |
| 139 } | 139 } |
| 140 | 140 |
| 141 /** Inform renderer whether it should draw a label. */ | 141 /** Inform renderer whether it should draw a label. */ |
| 142 protected void applyShowArea(StableXYDifferenceRenderer renderer) { | 142 protected void applyShowAreaLabel(StableXYDifferenceRenderer renderer) { |
| 143 renderer.setLabelArea(theme.parseShowArea()); | 143 renderer.setLabelArea(theme.parseShowAreaLabel()); |
| 144 } | 144 } |
| 145 | 145 |
| 146 protected void applyOutlineStyle(StableXYDifferenceRenderer renderer) { | 146 protected void applyOutlineStyle(StableXYDifferenceRenderer renderer) { |
| 147 float[] dashes = theme.parseLineStyle(); | 147 float[] dashes = theme.parseLineStyle(); |
| 148 int size = theme.parseLineWidth(); | 148 int size = theme.parseLineWidth(); |