diff artifacts/src/main/java/org/dive4elements/river/jfree/StyledAreaSeriesCollection.java @ 8885:e5f688820951

Some minor changes on chart: allow area-themes to consider range; allow for axis-margins
author gernotbelger
date Wed, 14 Feb 2018 18:10:28 +0100
parents 5e38e2924c07
children d9c89651bd67
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/jfree/StyledAreaSeriesCollection.java	Tue Feb 13 14:53:23 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/jfree/StyledAreaSeriesCollection.java	Wed Feb 14 18:10:28 2018 +0100
@@ -27,14 +27,13 @@
     private static final long serialVersionUID = 5274940965666948237L;
 
     /** Mode, how to draw/which areas to fill. */
-    public enum FILL_MODE {UNDER, ABOVE, BETWEEN};
+    public enum FILL_MODE {UNDER, ABOVE, BETWEEN}
 
     /** MODE in use. */
-    protected FILL_MODE mode;
+    private FILL_MODE mode;
 
     /** Theme-document with attributes about actual visual representation. */
-    protected ThemeDocument theme;
-
+    private ThemeDocument theme;
 
     /**
      * @param theme the theme-document.
@@ -70,6 +69,7 @@
         applyShowShape(renderer);
         applyOutlineColor(renderer);
         applyOutlineStyle(renderer);
+        applyShowLine(renderer);
         applyShowAreaLabel(renderer);
         if (mode == FILL_MODE.UNDER) {
             renderer.setAreaCalculationMode(
@@ -90,7 +90,7 @@
     }
 
 
-    protected void applyFillColor(StableXYDifferenceRenderer renderer) {
+    private void applyFillColor(StableXYDifferenceRenderer renderer) {
         Color paint = theme.parseAreaBackgroundColor();
 
         int transparency = theme.parseAreaTransparency();
@@ -119,34 +119,28 @@
     }
 
 
-    protected void applyShowShape(StableXYDifferenceRenderer renderer) {
+    private void applyShowShape(StableXYDifferenceRenderer renderer) {
         boolean show = theme.parseAreaShowBorder();
         renderer.setDrawOutline(show);
     }
 
 
-    protected void applyShowLine(StableXYDifferenceRenderer renderer) {
+    private void applyShowLine(StableXYDifferenceRenderer renderer) {
         boolean show = theme.parseShowLine();
         renderer.setShapesVisible(show);
     }
 
-
-    protected void applyOutlineColor(StableXYDifferenceRenderer renderer) {
+    private void applyOutlineColor(StableXYDifferenceRenderer renderer) {
         Color c = theme.parseLineColorField();
         renderer.setOutlinePaint(c);
     }
 
-    protected void applyOutlineWidth(StableXYDifferenceRenderer renderer) {
-        // int size = theme.parseLineWidth();
-        // XXX: Why is this not set?
-    }
-
     /** Inform renderer whether it should draw a label. */
-    protected void applyShowAreaLabel(StableXYDifferenceRenderer renderer) {
+    private void applyShowAreaLabel(StableXYDifferenceRenderer renderer) {
         renderer.setLabelArea(theme.parseShowAreaLabel());
     }
 
-    protected void applyOutlineStyle(StableXYDifferenceRenderer renderer) {
+    private void applyOutlineStyle(StableXYDifferenceRenderer renderer) {
         float[] dashes = theme.parseLineStyle();
         int size       = theme.parseLineWidth();
 
@@ -166,5 +160,9 @@
 
         renderer.setOutlineStroke(stroke);
     }
+
+    public boolean shouldCalculateRange() {
+        return theme.parseCalculateRange();
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :

http://dive4elements.wald.intevation.org