From 1f21d27019a0924782559cb7c80db85759ddb29e Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Wed, 27 Feb 2013 19:53:38 +0100
Subject: [PATCH] legend - don't show line for scatter charts
---
.../com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java | 4 ++--
.../main/java/com/xeiam/xchart/internal/chartpart/Legend.java | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
index 3883fe6a..2240c62b 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
@@ -23,6 +23,7 @@ import com.xeiam.xchart.Chart;
import com.xeiam.xchart.SwingWrapper;
import com.xeiam.xchart.demo.charts.ExampleChart;
import com.xeiam.xchart.style.StyleManager.ChartType;
+import com.xeiam.xchart.style.StyleManager.LegendPosition;
/**
* Gaussian Blob
@@ -56,8 +57,7 @@ public class ScatterChart01 implements ExampleChart {
// Customize Chart
chart.getStyleManager().setChartTitleVisible(false);
- chart.getStyleManager().setLegendVisible(false);
-
+ chart.getStyleManager().setLegendPosition(LegendPosition.InsideSW);
// Series
chart.addSeries("Gaussian Blob", xData, yData);
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
index 0e73d203..81e02efa 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
@@ -159,12 +159,14 @@ public class Legend implements ChartPart {
Series series = seriesMap.get(seriesId);
if (getChart().getStyleManager().getChartType() != ChartType.Bar) {
+
// paint line
- if (series.getStroke() != null) {
+ if (getChart().getStyleManager().getChartType() != ChartType.Scatter && series.getStroke() != null) {
g.setColor(series.getStrokeColor());
g.setStroke(series.getStroke());
g.drawLine(startx, starty + (int) (maxContentHeight / 2.0), (int) (startx + Marker.SIZE * 3.0), starty + (int) (maxContentHeight / 2.0));
}
+
// paint marker
if (series.getMarker() != null) {
g.setColor(series.getMarkerColor());
--
GitLab