Fixed data point plotting.

refs 2605

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

@@ -112,7 +112,8 @@ public final class Sample {
 		nexusData.setPoint(screen, sc640);
 		spiderChart.addData(nexusData);
 
-		ChartStyle chartStyle = new ChartStyle(true, true, false);
+		ChartStyle chartStyle = new ChartStyle(true, true, true);
+		chartStyle.setUseIndividualAxisSegments(false);
 		chartStyle.setTitleStyle(new FontStyle(VERDANA_14PT, getDarkerColor(BLUE)));
 		LegendStyle legendStyle = new LegendStyle(BLUE, false, 5, BLACK_VERDANA_12PT);
 		chartStyle.setLegendStyle(legendStyle);
@@ -131,8 +132,7 @@ public final class Sample {
 		chartStyle.setAxisStyle(display, aStyle4Segs);
 		chartStyle.setAxisStyle(memory, aStyle4Segs);
 		chartStyle.setAxisStyle(brand, aStyle4Segs);
-		chartStyle.setAxisStyle(screen, aStyle4Segs);
-		chartStyle.setUseIndividualAxisSegments(false);
+		chartStyle.setAxisStyle(screen, aStyle6Segs);
 		chartStyle.setAxisSegments(4);
 		chartStyle.setBackgroundFillStyle(new FillStyle(LIGHT_GRAY));
 		chartStyle.setBackgroundLineStyle(new LineStyle(DARK_GRAY));

org.fortiss.tooling.spiderchart.ui/trunk/src/org/fortiss/tooling/spiderchart/model/EnumerationAxis.java

@@ -50,18 +50,14 @@ public final class EnumerationAxis<T extends Object> extends AxisBase {
 		return null;
 	}
 
+	/** Returns the index of the given member. */
+	public int indexOfEnumerationMember(T member) {
+		return values.indexOf(member);
+	}
+
 	/** {@inheritDoc} */
 	@Override
 	public boolean isValidValue(Object d) {
 		return values.contains(d);
 	}
-
-	/** Returns the ratio for the given value. */
-	public Double getAxisRatio(T value) {
-		int index = values.indexOf(value);
-		if(index == -1) {
-			return 0.0;
-		}
-		return (double)index / (double)values.size();
-	}
 }

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

@@ -245,7 +245,11 @@ public final class SpiderChartWidget extends SpiderChartWidgetBase {
 		}
 		if(axis instanceof EnumerationAxis) {
 			EnumerationAxis<Object> ea = (EnumerationAxis<Object>)axis;
-			ratio = ea.getAxisRatio(data.getAxisValue(ea));
+			int segments =
+					style.isUseIndividualAxisSegments() ? style.getAxisStyle(axis).getSegments()
+							: style.getAxisSegments();
+			int index = Math.max(0, ea.indexOfEnumerationMember(data.getAxisValue(ea)));
+			ratio = (double)index / (double)segments;
 		}
 		Point outer = axesEnds.get(axis);
 		int deltaX = (int)(ratio * (outer.x - center.x));