diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart01.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart01.java index 9bc6db2e8b3661bfa4ad48c5e2cb87c6d52b7aed..4561aa93fcc89b7fd84d0ec063b971362f861a60 100644 --- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart01.java +++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart01.java @@ -79,7 +79,6 @@ public class RealtimeChart01 implements ExampleChart { public XChartPanel buildPanel() { - yData = getRandomData(5); return new XChartPanel(getChart()); } diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart02.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart02.java index 899d2e2db7c75d75e0377270d64f03fca2d6c861..d031319925acc37251a02a4cec782da8623541e7 100644 --- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart02.java +++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart02.java @@ -34,7 +34,6 @@ import com.xeiam.xchart.demo.charts.ExampleChart; public class RealtimeChart02 implements ExampleChart { private Chart chart; - // private XChartPanel chartPanel; public static final String SERIES_NAME = "series1"; private List<Integer> xData; private List<Double> yData; @@ -82,9 +81,6 @@ public class RealtimeChart02 implements ExampleChart { public XChartPanel buildPanel() { - yData = getRandomData(5); - xData = getMonotonicallyIncreasingData(5); - return new XChartPanel(getChart()); } diff --git a/xchart/src/main/java/com/xeiam/xchart/Series.java b/xchart/src/main/java/com/xeiam/xchart/Series.java index 32df03311fce857a8fd6c4b05fde1dfda859d1a5..8d0109a7c996f6dafd5ec80b8d0582e7264a544a 100644 --- a/xchart/src/main/java/com/xeiam/xchart/Series.java +++ b/xchart/src/main/java/com/xeiam/xchart/Series.java @@ -303,7 +303,7 @@ public class Series { return name; } - void replaceXData(List<? extends Number> newXData) { + void replaceXData(List<?> newXData) { xData = newXData; calculateMinMax(); diff --git a/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java b/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java index c4a25ab56f4b46e4d7ef996c9733b0a7b092cb18..b1f5161bd40a1c26a70e541311c4a7be66b26998 100644 --- a/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java +++ b/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java @@ -249,8 +249,9 @@ public class XChartPanel extends JPanel { * * @param seriesName * @param newYData + * @return */ - public void updateSeries(String seriesName, List<? extends Number> newYData) { + public Series updateSeries(String seriesName, List<? extends Number> newYData) { Series series = chart.getSeriesMap().get(seriesName); if (series == null) { @@ -268,6 +269,8 @@ public class XChartPanel extends JPanel { // Re-display the chart revalidate(); repaint(); + return series; + } /** @@ -275,8 +278,9 @@ public class XChartPanel extends JPanel { * * @param seriesName * @param newYData + * @return */ - public void updateSeries(String seriesName, List<? extends Number> newXData, List<? extends Number> newYData) { + public Series updateSeries(String seriesName, List<?> newXData, List<? extends Number> newYData) { Series series = chart.getSeriesMap().get(seriesName); if (series == null) { @@ -288,5 +292,7 @@ public class XChartPanel extends JPanel { // Re-display the chart revalidate(); repaint(); + + return series; } }