Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/jfree/XYStyle.java @ 9360:ddcd52d239cd
Outliers in fixation calculation are now shown within the other 'B' event themes and get a separate symbol (triangle).
Removed old outliers theme.
Also consider showpoints property.
Also consider pointsize property.
| author | gernotbelger |
|---|---|
| date | Wed, 01 Aug 2018 17:13:52 +0200 |
| parents | 094ed9d1f2ad |
| children | ef5754ba5573 |
comparison
equal
deleted
inserted
replaced
| 9359:df6f1b5806f6 | 9360:ddcd52d239cd |
|---|---|
| 177 r.setSeriesOutlinePaint(idx, c); | 177 r.setSeriesOutlinePaint(idx, c); |
| 178 r.setDrawOutlines(showOutline); | 178 r.setDrawOutlines(showOutline); |
| 179 r.setUseOutlinePaint(c != null); | 179 r.setUseOutlinePaint(c != null); |
| 180 | 180 |
| 181 r.setSeriesShapesVisible(idx, show || showOutline); | 181 r.setSeriesShapesVisible(idx, show || showOutline); |
| 182 | |
| 183 // applyShowPoints(r, idx); | |
| 184 // applyPointColor(r, idx); | |
| 185 | |
| 186 // applyUseFillPaint(r); | |
| 187 } | 182 } |
| 188 | 183 |
| 189 private void applyPointSize(final XYLineAndShapeRenderer r, final int idx) { | 184 private void applyPointSize(final XYLineAndShapeRenderer r, final int idx) { |
| 190 final int size = this.theme.parsePointWidth(); | 185 final int size = this.theme.parsePointWidth(); |
| 191 final int dim = 2 * size; | 186 final int dim = 2 * size; |
| 192 | 187 |
| 193 r.setSeriesShape(idx, new Ellipse2D.Double(-size, -size, dim, dim)); | 188 r.setSeriesShape(idx, new Ellipse2D.Double(-size, -size, dim, dim)); |
| 194 } | 189 } |
| 195 | 190 |
| 196 private void applyPointColor(final XYLineAndShapeRenderer r, final int idx) { | |
| 197 final Color c = this.theme.parsePointColor(); | |
| 198 | |
| 199 boolean alt = false; | |
| 200 if (alt) { | |
| 201 | |
| 202 if (c != null) { | |
| 203 r.setSeriesFillPaint(idx, c); | |
| 204 | |
| 205 r.setUseFillPaint(true); | |
| 206 r.setDrawOutlines(false); | |
| 207 } | |
| 208 } else { | |
| 209 // if (c != null) { | |
| 210 r.setSeriesFillPaint(idx, c); | |
| 211 r.setUseFillPaint(c != null); | |
| 212 | |
| 213 r.setSeriesOutlinePaint(idx, c); | |
| 214 r.setDrawOutlines(c != null); | |
| 215 // } | |
| 216 } | |
| 217 } | |
| 218 | |
| 219 /** | |
| 220 * Sets form and visibility of points. | |
| 221 */ | |
| 222 private void applyShowPoints(final XYLineAndShapeRenderer r, final int idx) { | |
| 223 final boolean show = this.theme.parseShowPoints(); | |
| 224 | |
| 225 r.setSeriesShapesVisible(idx, show); | |
| 226 r.setDrawOutlines(true); | |
| 227 } | |
| 228 | |
| 229 // private void applyUseFillPaint(final XYLineAndShapeRenderer r) { | |
| 230 // final Boolean use = this.theme.parseUseFillPaint(); | |
| 231 // if (use != null) { | |
| 232 // r.setUseFillPaint(use); | |
| 233 // } | |
| 234 // } | |
| 235 | |
| 236 private void applyShowLine(final XYLineAndShapeRenderer r, final int idx) { | 191 private void applyShowLine(final XYLineAndShapeRenderer r, final int idx) { |
| 237 final boolean show = this.theme.parseShowLine(); | 192 final boolean show = this.theme.parseShowLine(); |
| 238 r.setSeriesLinesVisible(idx, show); | 193 r.setSeriesLinesVisible(idx, show); |
| 239 } | 194 } |
| 240 | 195 |