# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1331814491 0
# Node ID d75b427da50a6052fdcd323ecb853b9c05899e39
# Parent  95ddff4acb958353316c9ced06fb3cc915696f6f
#522 Modified axes creation: label and tick label fonts will now always be the same.

flys-artifacts/trunk@4146 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 95ddff4acb95 -r d75b427da50a flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu Mar 15 10:36:09 2012 +0000
+++ b/flys-artifacts/ChangeLog	Thu Mar 15 12:28:11 2012 +0000
@@ -1,3 +1,16 @@
+2012-03-15  Ingo Weinzierl <ingo@intevation.de>
+
+	flys/issue522 (W-INFO / Bezugslinienverfahren / Schriftgröße der Achsenbeschriftung)
+
+	* src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java,
+	  src/main/java/de/intevation/flys/exports/ChartGenerator.java,
+	  src/main/java/de/intevation/flys/exports/XYChartGenerator.java: Label and
+	  tick label fonts for axes will now always be the same.
+
+	* src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java:
+	  Removed the createYAxis() method which is already implemented in an
+	  upper class. There, the method also takes the ChartSettings into account.
+
 2012-03-15  Raimund Renkert <raimund.renkert@intevation.de>
 
 	Issue 547.
diff -r 95ddff4acb95 -r d75b427da50a flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Thu Mar 15 10:36:09 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java	Thu Mar 15 12:28:11 2012 +0000
@@ -1335,6 +1335,7 @@
 
         axis.setAutoRangeIncludesZero(false);
         axis.setLabelFont(labelFont);
+        axis.setTickLabelFont(labelFont);
 
         return axis;
     }
diff -r 95ddff4acb95 -r d75b427da50a flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Thu Mar 15 10:36:09 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java	Thu Mar 15 12:28:11 2012 +0000
@@ -127,25 +127,6 @@
     }
 
 
-    /**
-     * Create Y-Axis.
-     * First Axis: W.
-     * @return Y-Axis with label.
-     */
-    @Override
-    protected NumberAxis createYAxis(int index) {
-        Font labelFont = new Font("Tahoma", Font.BOLD, 14);
-        String label = "default";
-        if (index == YAXIS.W.idx) {
-            label = getYAxisLabel(0);
-        }
-        NumberAxis axis = createNumberAxis(index, label);
-        axis.setLabelFont(labelFont);
-        axis.setAutoRangeIncludesZero(false);
-        return axis;
-    }
-
-
     public void doOut(
         ArtifactAndFacet artifactFacet,
         Document         theme,
diff -r 95ddff4acb95 -r d75b427da50a flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java	Thu Mar 15 10:36:09 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java	Thu Mar 15 12:28:11 2012 +0000
@@ -448,6 +448,7 @@
             getXAxisLabelFontSize());
 
         xaxis.setLabelFont(labelFont);
+        xaxis.setTickLabelFont(labelFont);
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 95ddff4acb95 -r d75b427da50a flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Thu Mar 15 10:36:09 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java	Thu Mar 15 12:28:11 2012 +0000
@@ -921,6 +921,7 @@
             getXAxisLabelFontSize());
 
         xaxis.setLabelFont(labelFont);
+        xaxis.setTickLabelFont(labelFont);
     }