From fd973abb3667d2c774f60cc8262bc0db60509730 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Fri, 10 Jan 2014 22:17:45 +0100
Subject: [PATCH] allowed for date X-Axis types for real-time plots
---
.../xchart/demo/charts/realtime/RealtimeChart01.java | 1 -
.../xchart/demo/charts/realtime/RealtimeChart02.java | 4 ----
xchart/src/main/java/com/xeiam/xchart/Series.java | 2 +-
xchart/src/main/java/com/xeiam/xchart/XChartPanel.java | 10 ++++++++--
4 files changed, 9 insertions(+), 8 deletions(-)
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 9bc6db2e..4561aa93 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 899d2e2d..d0313199 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 32df0331..8d0109a7 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 c4a25ab5..b1f5161b 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;
}
}
--
GitLab