Mercurial > dive4elements > river
changeset 2590:d75b427da50a
#522 Modified axes creation: label and tick label fonts will now always be the same.
flys-artifacts/trunk@4146 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Thu, 15 Mar 2012 12:28:11 +0000 |
| parents | 95ddff4acb95 |
| children | 74c02dbf17ca |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/exports/ChartGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/DischargeCurveGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/TimeseriesChartGenerator.java flys-artifacts/src/main/java/de/intevation/flys/exports/XYChartGenerator.java |
| diffstat | 5 files changed, 16 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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; }
--- 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,
--- 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 :
--- 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); }