dive4elements/river: artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java comparison

comparison artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java @ 7068:726d998dce29 generator-refactoring

Remove Axis Walker, unabstract Diagram generator Diagram generator can now be used as an instance configured in the out-generators config

author	Andre Heinecke <aheinecke@intevation.de>
date	Fri, 20 Sep 2013 14:55:44 +0200
parents	06a9a241faac
children	0a337f0005c2

comparison

equal deleted inserted replaced

-:eb24d5203d17
+:726d998dce29
 protected SortedMap<Integer, AxisDataset> datasets;
 /** List of annotations to insert in plot. */
 protected List<RiverAnnotation> annotations = new ArrayList<RiverAnnotation>();
-/**
+protected abstract List<AxisSection> buildYAxisSections();
-* A mini interface that allows to walk over the YAXIS enums defined in
-* subclasses.
-*/
-public interface YAxisWalker {
-int length();
-String getId(int idx);
-} // end of YAxisWalker interface
 /**
 * Default constructor that initializes internal data structures.
 */
 public ChartGenerator2() {
 ArtifactAndFacet bundle,
 ThemeDocument    attr,
 boolean          visible);
-protected abstract YAxisWalker getYAxisWalker();
 protected abstract Series getSeriesOf(XYDataset dataset, int idx);
 /**
 * Returns the default title of a chart.
 *
 * @return the default title of a chart.
 */
 protected abstract String getDefaultChartTitle();
+/**
+* Returns the default Y-Axis label of a chart.
+*
+* @return the default Y-Axis label of a chart.
+*/
+protected abstract String getDefaultYAxisLabel(int index);
 /**
 * Returns the default X-Axis label of a chart.
 *
 * @return the default X-Axis label of a chart.
 */
 protected abstract String getDefaultXAxisLabel();
-/**
-* This method is called to retrieve the default label for an Y axis at
-* position <i>pos</i>.
-*
-* @param pos The position of an Y axis.
-*
-* @return the default Y axis label at position <i>pos</i>.
-*/
-protected abstract String getDefaultYAxisLabel(int pos);
 /**
 * This method is used to create new AxisDataset instances which may differ
 * in concrete subclasses.
 *
 return axisSections;
 }
 /**
-* Creates a list of Section for the chart's Y axes. This method makes use
-* of <i>getYAxisWalker</i> to be able to access all Y axes defined in
-* subclasses.
-*
-* @return a list of Y axis sections.
-*/
-protected List<AxisSection> buildYAxisSections() {
-List<AxisSection> axisSections = new ArrayList<AxisSection>();
-YAxisWalker walker = getYAxisWalker();
-for (int i = 0, n = walker.length(); i < n; i++) {
-AxisSection ySection = new AxisSection();
-ySection.setIdentifier(walker.getId(i));
-ySection.setLabel(getYAxisLabel(i));
-ySection.setFontSize(14);
-ySection.setFixed(false);
-// XXX We are able to find better default ranges that [0,0], the
-// only problem is, that we do NOT have a better range than [0,0]
-// for each axis, because the initial chart will not have a dataset
-// for each axis set!
-ySection.setUpperRange(0d);
-ySection.setLowerRange(0d);
-axisSections.add(ySection);
-}
-return axisSections;
-}
-/**
 * Returns the <i>settings</i> as <i>ChartSettings</i>.
 *
 * @return the <i>settings</i> as <i>ChartSettings</i> or null, if
 * <i>settings</i> is not an instance of <i>ChartSettings</i>.
 */
 Integer fontSize = as.getFontSize();
 return fontSize != null ? fontSize : DEFAULT_FONT_SIZE;
 }
+/**
+* Glue between axis names and index.
+*/
+protected abstract String axisIndexToName(int index);
 /**
 * This method returns the font size for an Y axis. If the font size is
 * specified in ChartSettings (if <i>chartSettings</i> is set), this size is
 * returned. Otherwise the default font size 12 is returned.
 *
 * @return the font size for the x axis.
 */
-protected int getYAxisFontSize(int pos) {
+protected int getYAxisFontSize(int index) {
 ChartSettings chartSettings = getChartSettings();
 if (chartSettings == null) {
 return DEFAULT_FONT_SIZE;
 }
-YAxisWalker walker = getYAxisWalker();
+AxisSection as = chartSettings.getAxisSection(axisIndexToName(index));
-AxisSection   as = chartSettings.getAxisSection(walker.getId(pos));
 if (as == null) {
 return DEFAULT_FONT_SIZE;
 }
 Integer fontSize = as.getFontSize();
 return fontSize != null ? fontSize : DEFAULT_FONT_SIZE;
 }
 /**
 * This method returns the export dimension specified in ChartSettings as
 * int array [width,height].
 *
 * Returns the Y-Axis label of a chart at position <i>pos</i>.
 *
 * @return the Y-Axis label of a chart at position <i>0</i>.
 */
 protected String getYAxisLabel(int pos) {
+return "TODO lalal";
+/*
 ChartSettings chartSettings = getChartSettings();
 if (chartSettings == null) {
 return getDefaultYAxisLabel(pos);
 }
 if (label != null) {
 return label;
 }
 }
-return getDefaultYAxisLabel(pos);
+return getDefaultYAxisLabel(pos);*/
 }
 /**
 * This method searches for a specific axis in the <i>settings</i> if
 * @param label The label of the new axis.
 *
 * @return an instance of IdentifiableNumberAxis.
 */
 protected NumberAxis createNumberAxis(int idx, String label) {
-YAxisWalker walker = getYAxisWalker();
+return new IdentifiableNumberAxis(axisIndexToName(idx), label);
-return new IdentifiableNumberAxis(walker.getId(idx), label);
 }
 /**
 * Create Y (range) axis for given index.
 * Shall be overriden by subclasses.
 */
 protected NumberAxis createYAxis(int index) {
-YAxisWalker walker = getYAxisWalker();
 Font labelFont = new Font(
 DEFAULT_FONT_NAME,
 Font.BOLD,
 getYAxisFontSize(index));
 IdentifiableNumberAxis axis = new IdentifiableNumberAxis(
-walker.getId(index),
+axisIndexToName(index),
 getYAxisLabel(index));
 axis.setAutoRangeIncludesZero(false);
 axis.setLabelFont(labelFont);
 axis.setTickLabelFont(labelFont);

Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/exports/ChartGenerator2.java @ 7068:726d998dce29 generator-refactoring