Spider chart values printed using decimal formatter.

refs 2589

org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/example/Sample.java

@@ -28,6 +28,8 @@ import static org.fortiss.tooling.spiderchart.util.RGBColorUtils.NAVY;
 import static org.fortiss.tooling.spiderchart.util.RGBColorUtils.OLIVE;
 import static org.fortiss.tooling.spiderchart.util.RGBColorUtils.getDarkerColor;
 
+import java.text.DecimalFormat;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.GridData;
@@ -68,8 +70,8 @@ public final class Sample {
 		spiderChart.setTitle("Smartphone Comparison Scale");
 		spiderChart.setLegendLabel("Legend");
 
-		Axis battery = new Axis("Battery", 0.0, 5.0);
-		Axis camera = new Axis("Camera", 0.0, 5.0);
+		Axis battery = new Axis("Battery", 0.0, 4.0);
+		Axis camera = new Axis("Camera", 0.0, 7.0);
 		Axis display = new Axis("Display", 0.0, 5.0);
 		Axis memory = new Axis("Memory", 0.0, 5.0);
 		Axis brand = new Axis("Brand", 0.0, 5.0);
@@ -104,24 +106,36 @@ public final class Sample {
 		LegendStyle legendStyle = new LegendStyle(BLUE, true, 5, BLACK_VERDANA_12PT);
 		chartStyle.setLegendStyle(legendStyle);
 
-		AxisStyle aStyle = new AxisStyle(SOLID_BLACK_1PT, BLACK_VERDANA_14PT, 4, BLACK_VERDANA_8PT);
-		chartStyle.setAxisStyle(battery, aStyle);
-		chartStyle.setAxisStyle(camera, aStyle);
-		chartStyle.setAxisStyle(display, aStyle);
-		chartStyle.setAxisStyle(memory, aStyle);
-		chartStyle.setAxisStyle(brand, aStyle);
-		chartStyle.setAxisStyle(screen, aStyle);
+		AxisStyle aStyle3Segs =
+				new AxisStyle(SOLID_BLACK_1PT, BLACK_VERDANA_14PT, 3, BLACK_VERDANA_8PT,
+						new DecimalFormat("#.##"));
+		chartStyle.setAxisStyle(battery, aStyle3Segs);
+		AxisStyle aStyle6Segs =
+				new AxisStyle(SOLID_BLACK_1PT, BLACK_VERDANA_14PT, 6, BLACK_VERDANA_8PT,
+						new DecimalFormat("#.##"));
+		chartStyle.setAxisStyle(camera, aStyle6Segs);
+		AxisStyle aStyle4Segs =
+				new AxisStyle(SOLID_BLACK_1PT, BLACK_VERDANA_14PT, 4, BLACK_VERDANA_8PT,
+						new DecimalFormat("#.##"));
+		chartStyle.setAxisStyle(display, aStyle4Segs);
+		chartStyle.setAxisStyle(memory, aStyle4Segs);
+		chartStyle.setAxisStyle(brand, aStyle4Segs);
+		chartStyle.setAxisStyle(screen, aStyle4Segs);
+		chartStyle.setUseIndividualAxisSegments(true);
+		chartStyle.setAxisSegments(4);
 
 		LineStyle olive1pt = new LineStyle(OLIVE);
 		FillStyle oliveFill = new FillStyle(OLIVE, 128);
 		DataSeriesStyle iphoneStyle =
-				new DataSeriesStyle(olive1pt, oliveFill, true, true, BLACK_VERDANA_10PT, 7);
+				new DataSeriesStyle(olive1pt, oliveFill, true, true, BLACK_VERDANA_10PT, 7,
+						new DecimalFormat("#.#"));
 		chartStyle.setDataSeriesStyle(iPhoneData, iphoneStyle);
 
 		LineStyle navy1pt = new LineStyle(NAVY);
 		FillStyle navyFill = new FillStyle(NAVY, 128);
 		DataSeriesStyle nexusStyle =
-				new DataSeriesStyle(navy1pt, navyFill, true, true, BLACK_VERDANA_10PT, 7);
+				new DataSeriesStyle(navy1pt, navyFill, true, true, BLACK_VERDANA_10PT, 7,
+						new DecimalFormat("#.#"));
 		chartStyle.setDataSeriesStyle(nexusData, nexusStyle);
 
 		viewer = new SpiderChartViewer(shell, spiderChart, chartStyle);

org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/AxisStyle.java

@@ -22,6 +22,8 @@ import static org.fortiss.tooling.spiderchart.style.FontStyle.BLACK_VERDANA_12PT
 import static org.fortiss.tooling.spiderchart.style.FontStyle.BLACK_VERDANA_8PT;
 import static org.fortiss.tooling.spiderchart.style.LineStyle.SOLID_BLACK_1PT;
 
+import java.text.DecimalFormat;
+
 import org.fortiss.tooling.spiderchart.model.Axis;
 
 /**
@@ -48,19 +50,28 @@ public final class AxisStyle {
 	private int segments;
 	/** The font style of the segment labels. */
 	private FontStyle segmentStyle;
+	/** The decimal formatter of the segment labels of the axis. */
+	private DecimalFormat decimalFormat;
 
 	/** Constructor. */
 	public AxisStyle(LineStyle lineStyle, FontStyle labelStyle) {
-		this(lineStyle, labelStyle, 0, null);
+		this(lineStyle, labelStyle, 0, null, new DecimalFormat("#.##"));
 	}
 
 	/** Constructor. */
 	public AxisStyle(LineStyle lineStyle, FontStyle labelStyle, int numSegments,
 			FontStyle segmentStyle) {
+		this(lineStyle, labelStyle, numSegments, segmentStyle, new DecimalFormat("#.##"));
+	}
+
+	/** Constructor. */
+	public AxisStyle(LineStyle lineStyle, FontStyle labelStyle, int numSegments,
+			FontStyle segmentStyle, DecimalFormat decimalFormat) {
 		this.lineStyle = requireNonNull(lineStyle);
 		this.labelStyle = requireNonNull(labelStyle);
 		this.segments = Math.max(1, numSegments);
 		this.segmentStyle = segmentStyle;
+		this.decimalFormat = decimalFormat;
 	}
 
 	/** Returns the line style. */
@@ -82,4 +93,9 @@ public final class AxisStyle {
 	public FontStyle getSegmentStyle() {
 		return segmentStyle;
 	}
+
+	/** Returns the decimal format. */
+	public DecimalFormat getDecimalFormat() {
+		return decimalFormat;
+	}
 }

org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/style/DataSeriesStyle.java

@@ -21,6 +21,8 @@ import static org.fortiss.tooling.spiderchart.style.FontStyle.BLACK_VERDANA_10PT
 import static org.fortiss.tooling.spiderchart.style.LineStyle.SOLID_BLACK_1PT;
 import static org.fortiss.tooling.spiderchart.util.RGBColorUtils.LIGHT_GRAY;
 
+import java.text.DecimalFormat;
+
 import org.fortiss.tooling.spiderchart.model.DataSeries;
 
 /**
@@ -45,21 +47,26 @@ public final class DataSeriesStyle {
 	private final boolean showIndicators;
 	/** The flag to show indicator labels. */
 	private final boolean showIndicatorLabels;
+	/** The decimal formatter of the segment labels of the axis. */
+	private DecimalFormat decimalFormat;
 
 	/** Constructor. */
 	public DataSeriesStyle(LineStyle lineStyle, FillStyle fillStyle, boolean withIndicators,
-			boolean withIndicatorLabels, FontStyle indicatorStyle, int indicatorSize) {
+			boolean withIndicatorLabels, FontStyle indicatorStyle, int indicatorSize,
+			DecimalFormat decimalFormat) {
 		this.lineStyle = lineStyle;
 		this.fillStyle = fillStyle;
 		this.showIndicators = withIndicators;
 		this.showIndicatorLabels = withIndicatorLabels;
 		this.indicatorLabelStyle = indicatorStyle;
 		this.indicatorSize = indicatorSize;
+		this.decimalFormat = decimalFormat;
 	}
 
 	/** Constructor. */
 	public DataSeriesStyle() {
-		this(SOLID_BLACK_1PT, new FillStyle(LIGHT_GRAY), true, true, BLACK_VERDANA_10PT, 7);
+		this(SOLID_BLACK_1PT, new FillStyle(LIGHT_GRAY), true, true, BLACK_VERDANA_10PT, 7,
+				new DecimalFormat("#.##"));
 	}
 
 	/** Returns line style. */
@@ -91,4 +98,9 @@ public final class DataSeriesStyle {
 	public int getIndicatorSize() {
 		return indicatorSize;
 	}
+
+	/** Returns the decimal format. */
+	public DecimalFormat getDecimalFormat() {
+		return decimalFormat;
+	}
 }

org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/util/AxisUtils.java

@@ -32,15 +32,15 @@ import org.fortiss.tooling.spiderchart.style.AxisStyle;
 public class AxisUtils {
 
 	/** Returns the segment point on the axis if the the axis displayed with the given extents. */
-	public static Point getSegmentPoint(AxisStyle style, int segment, int extentX, int extentY) {
-		int segments = style.getSegments();
-		int segmentX = extentX / segments;
-		int segmentY = extentY / segments;
+	public static Point
+			getSegmentPoint(int numberOfSegments, int segment, int extentX, int extentY) {
+		int segmentX = extentX / numberOfSegments;
+		int segmentY = extentY / numberOfSegments;
 		return new Point(segmentX * segment, segmentY * segment);
 	}
 
 	/** Returns the segment point on the axis if the the axis displayed with the given extents. */
 	public static Point getSegmentPoint(AxisStyle style, int segment, Point extent) {
-		return getSegmentPoint(style, segment, extent.x, extent.y);
+		return getSegmentPoint(style.getSegments(), segment, extent.x, extent.y);
 	}
 }

org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/widget/SpiderChartWidget.java

@@ -126,7 +126,7 @@ public final class SpiderChartWidget extends SpiderChartWidgetBase {
 				drawIndicator(gc, dStyle, p);
 			}
 			if(dStyle.isShowIndicatorLabels()) {
-				drawIndicatorLabel(gc, dStyle.getIndicatorLabelStyle(), p, data.getAxisValue(axis));
+				drawIndicatorLabel(gc, dStyle, p, data.getAxisValue(axis));
 			}
 		}
 		path.close();
@@ -154,16 +154,16 @@ public final class SpiderChartWidget extends SpiderChartWidgetBase {
 	}
 
 	/** Draws the indicator labels next to the chart point. */
-	private void drawIndicatorLabel(GC gc, FontStyle indicatorLabelStyle, Point p, Double value) {
+	private void drawIndicatorLabel(GC gc, DataSeriesStyle dStyle, Point p, Double value) {
 		Font oldFont = gc.getFont();
-		Font font = indicatorLabelStyle.createSWTFont();
+		Font font = dStyle.getIndicatorLabelStyle().createSWTFont();
 		gc.setFont(font);
 
 		Color oldColor = gc.getForeground();
-		Color color = indicatorLabelStyle.createSWTColor();
+		Color color = dStyle.getIndicatorLabelStyle().createSWTColor();
 		gc.setForeground(color);
 
-		String label = value.toString();
+		String label = dStyle.getDecimalFormat().format(value);
 		Point textExtent = gc.textExtent(label);
 		int x = p.x;
 		if(x > center.x) {
@@ -221,11 +221,6 @@ public final class SpiderChartWidget extends SpiderChartWidgetBase {
 		int centerX = getX() + halfWidth;
 		int centerY = getY() + halfHeight;
 
-		double relativeMargin = 1.0 - style.getRelativeMargin();
-		int wExtent = (int)(relativeMargin * halfWidth);
-		int hExtent = (int)(relativeMargin * halfHeight);
-		int extent = Math.min(wExtent, hExtent);
-
 		for(int i = 0; i < size; i++) {
 			Axis axis = axes.get(i);
 			Point outer = axesEnds.get(axis);
@@ -235,13 +230,14 @@ public final class SpiderChartWidget extends SpiderChartWidgetBase {
 			// draw label
 			drawAxisLabel(gc, axis, aStyle, centerX, centerY, outer.x, outer.y);
 			// draw segment indicators
-			int segments = aStyle.getSegments();
+			int segments =
+					style.isUseIndividualAxisSegments() ? aStyle.getSegments() : style
+							.getAxisSegments();
 			for(int s = 1; s <= segments; s++) {
 				double ratio = (double)s / (double)segments;
-				// FIXME: use locale info here
-				String lbl = axis.getAxisValue(ratio).toString();
+				String lbl = aStyle.getDecimalFormat().format(axis.getAxisValue(ratio));
 				Point segmentPoint =
-						getSegmentPoint(aStyle, s, outer.x - center.x, outer.y - center.y);
+						getSegmentPoint(segments, s, outer.x - center.x, outer.y - center.y);
 				drawSegmentIndicator(gc, lbl, aStyle, centerX, centerY, segmentPoint);
 			}