diff 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
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/XYStyle.java	Wed Aug 01 13:21:34 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/jfree/XYStyle.java	Wed Aug 01 17:13:52 2018 +0200
@@ -179,11 +179,6 @@
         r.setUseOutlinePaint(c != null);
 
         r.setSeriesShapesVisible(idx, show || showOutline);
-
-        // applyShowPoints(r, idx);
-        // applyPointColor(r, idx);
-
-        // applyUseFillPaint(r);
     }
 
     private void applyPointSize(final XYLineAndShapeRenderer r, final int idx) {
@@ -193,46 +188,6 @@
         r.setSeriesShape(idx, new Ellipse2D.Double(-size, -size, dim, dim));
     }
 
-    private void applyPointColor(final XYLineAndShapeRenderer r, final int idx) {
-        final Color c = this.theme.parsePointColor();
-
-        boolean alt = false;
-        if (alt) {
-
-            if (c != null) {
-                r.setSeriesFillPaint(idx, c);
-
-                r.setUseFillPaint(true);
-                r.setDrawOutlines(false);
-            }
-        } else {
-            // if (c != null) {
-            r.setSeriesFillPaint(idx, c);
-            r.setUseFillPaint(c != null);
-
-            r.setSeriesOutlinePaint(idx, c);
-            r.setDrawOutlines(c != null);
-            // }
-        }
-    }
-
-    /**
-     * Sets form and visibility of points.
-     */
-    private void applyShowPoints(final XYLineAndShapeRenderer r, final int idx) {
-        final boolean show = this.theme.parseShowPoints();
-
-        r.setSeriesShapesVisible(idx, show);
-        r.setDrawOutlines(true);
-    }
-
-    // private void applyUseFillPaint(final XYLineAndShapeRenderer r) {
-    // final Boolean use = this.theme.parseUseFillPaint();
-    // if (use != null) {
-    // r.setUseFillPaint(use);
-    // }
-    // }
-
     private void applyShowLine(final XYLineAndShapeRenderer r, final int idx) {
         final boolean show = this.theme.parseShowLine();
         r.setSeriesLinesVisible(idx, show);

http://dive4elements.wald.intevation.org