Skip to content
Snippets Groups Projects
Commit ff7aae61 authored by Tim Molter's avatar Tim Molter
Browse files

updated example code to show adding series on List<Integer> etc…

parent 9238cac3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 67 additions and 65 deletions
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart02.java
+ 3
− 3
View file @ ff7aae61
......@@ -16,7 +16,7 @@
package com.xeiam.xchart.demo.charts.area;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import com.xeiam.xchart.Chart;
import com.xeiam.xchart.ChartBuilder;
......@@ -49,8 +49,8 @@ public class AreaChart02 implements ExampleChart {
// Create Chart
Chart chart = new ChartBuilder().chartType(ChartType.Area).width(800).height(600).title("AreaChart02").xAxisTitle("X").yAxisTitle("Y").build();
Collection<Number> xData = new ArrayList<Number>();
Collection<Number> yData = new ArrayList<Number>();
List<Integer> xData = new ArrayList<Integer>();
List<Integer> yData = new ArrayList<Integer>();
for (int i = 0; i < 5; i++) {
xData.add(i);
yData.add(i * i);
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java
+ 2
− 1
View file @ ff7aae61
......@@ -21,6 +21,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
......@@ -59,7 +60,7 @@ public class BarChart02 implements ExampleChart {
// Create Chart
Chart chart = new ChartBuilder().theme(ChartTheme.Matlab).chartType(ChartType.Bar).width(800).height(600).title("Units Sold Per Year").xAxisTitle("Year").yAxisTitle("Units Sold").build();
Collection<Date> xData = new ArrayList<Date>();
List<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
Random random = new Random();
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart01.java
+ 3
− 3
View file @ ff7aae61
......@@ -19,8 +19,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
......@@ -57,8 +57,8 @@ public class DateChart01 implements ExampleChart {
Random random = new Random();
// generate data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
DateFormat sdf = new SimpleDateFormat("HH:mm:ss.S");
Date date = null;
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java
+ 3
− 3
View file @ ff7aae61
......@@ -19,8 +19,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
......@@ -48,8 +48,8 @@ public class DateChart02 implements ExampleChart {
chart.getStyleManager().setLegendVisible(false);
// generate data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
Random random = new Random();
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java
+ 3
− 3
View file @ ff7aae61
......@@ -19,8 +19,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
......@@ -48,8 +48,8 @@ public class DateChart03 implements ExampleChart {
chart.getStyleManager().setLegendVisible(false);
// generate data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
Random random = new Random();
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java
+ 3
− 3
View file @ ff7aae61
......@@ -19,8 +19,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
......@@ -48,8 +48,8 @@ public class DateChart04 implements ExampleChart {
chart.getStyleManager().setLegendVisible(false);
// generate data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
Random random = new Random();
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java
+ 3
− 3
View file @ ff7aae61
......@@ -19,8 +19,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
......@@ -48,8 +48,8 @@ public class DateChart05 implements ExampleChart {
chart.getStyleManager().setLegendVisible(false);
// generate data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
Random random = new Random();
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java
+ 3
− 3
View file @ ff7aae61
......@@ -19,8 +19,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
......@@ -48,8 +48,8 @@ public class DateChart06 implements ExampleChart {
chart.getStyleManager().setLegendVisible(false);
// generate data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
Random random = new Random();
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java
+ 3
− 3
View file @ ff7aae61
......@@ -19,8 +19,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
......@@ -48,8 +48,8 @@ public class DateChart07 implements ExampleChart {
chart.getStyleManager().setLegendVisible(false);
// generate data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
Random random = new Random();
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart01.java
+ 2
− 2
View file @ ff7aae61
......@@ -46,8 +46,8 @@ public class LineChart01 implements ExampleChart {
public Chart getChart() {
// generates Log data
List<Number> xData = new ArrayList<Number>();
List<Number> yData = new ArrayList<Number>();
List<Integer> xData = new ArrayList<Integer>();
List<Double> yData = new ArrayList<Double>();
for (int i = -3; i <= 3; i++) {
xData.add(i);
yData.add(Math.pow(10, i));
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart02.java
+ 5
− 5
View file @ ff7aae61
......@@ -47,12 +47,12 @@ public class LineChart02 implements ExampleChart {
// generates sine data
int size = 30;
List<Number> xData1 = new ArrayList<Number>();
List<Number> yData1 = new ArrayList<Number>();
List<Integer> xData = new ArrayList<Integer>();
List<Double> yData = new ArrayList<Double>();
for (int i = 0; i <= size; i++) {
double radians = (Math.PI / (size / 2) * i);
xData1.add(i - size / 2);
yData1.add(size * Math.sin(radians));
xData.add(i - size / 2);
yData.add(size * Math.sin(radians));
}
// Create Chart
......@@ -63,7 +63,7 @@ public class LineChart02 implements ExampleChart {
chart.getStyleManager().setLegendVisible(false);
// Series 1
Series series1 = chart.addSeries("y=sin(x)", xData1, yData1);
Series series1 = chart.addSeries("y=sin(x)", xData, yData);
series1.setLineColor(SeriesColor.PURPLE);
series1.setLineStyle(SeriesLineStyle.DASH_DASH);
series1.setMarkerColor(SeriesColor.GREEN);
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java
+ 1
− 1
View file @ ff7aae61
......@@ -55,7 +55,7 @@ public class LineChart03 implements ExampleChart {
// generates linear data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> yData = new ArrayList<Number>();
Collection<Double> yData = new ArrayList<Double>();
DateFormat sdf = new SimpleDateFormat("dd.MM.yyyy");
Date date = null;
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart06.java
+ 2
− 1
View file @ ff7aae61
......@@ -32,6 +32,7 @@ import com.xeiam.xchart.demo.charts.ExampleChart;
* <li>Error Bars
* <li>Logarithmic Y-Axis
* <li>Setting min and max values for Y-Axis
* <li>Multi-line series labels in legend
*/
public class LineChart06 implements ExampleChart {
......@@ -61,7 +62,7 @@ public class LineChart06 implements ExampleChart {
chart.getStyleManager().setErrorBarsColor(Color.black);
Series series1 = chart.addSeries("Error bar test data", xData, yData1, errdata);
Series series1 = chart.addSeries("Error bar\ntest data", xData, yData1, errdata);
series1.setLineStyle(SeriesLineStyle.SOLID);
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
+ 2
− 2
View file @ ff7aae61
......@@ -42,8 +42,8 @@ public class ScatterChart01 implements ExampleChart {
@Override
public Chart getChart() {
List<Number> xData = new ArrayList<Number>();
List<Number> yData = new ArrayList<Number>();
List<Double> xData = new ArrayList<Double>();
List<Double> yData = new ArrayList<Double>();
Random random = new Random();
int size = 1000;
for (int i = 0; i < size; i++) {
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
+ 2
− 2
View file @ ff7aae61
......@@ -48,8 +48,8 @@ public class ScatterChart02 implements ExampleChart {
@Override
public Chart getChart() {
List<Number> xData = new ArrayList<Number>();
List<Number> yData = new ArrayList<Number>();
List<Double> xData = new ArrayList<Double>();
List<Double> yData = new ArrayList<Double>();
Random random = new Random();
int size = 400;
for (int i = 0; i < size; i++) {
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart04.java
+ 6
− 6
View file @ ff7aae61
......@@ -51,12 +51,12 @@ public class ScatterChart04 implements ExampleChart {
// generates data
int size = 10;
List<Number> xData1 = new ArrayList<Number>();
List<Number> yData1 = new ArrayList<Number>();
List<Number> errorBars = new ArrayList<Number>();
List<Integer> xData = new ArrayList<Integer>();
List<Double> yData = new ArrayList<Double>();
List<Double> errorBars = new ArrayList<Double>();
for (int i = 0; i <= size; i++) {
xData1.add(i);
yData1.add(10 * Math.exp(-i));
xData.add(i);
yData.add(10 * Math.exp(-i));
errorBars.add(Math.random() + .3);
}
......@@ -69,7 +69,7 @@ public class ScatterChart04 implements ExampleChart {
chart.getStyleManager().setAxisTitlesVisible(false);
// Series
Series series = chart.addSeries("10^(-x)", xData1, yData1, errorBars);
Series series = chart.addSeries("10^(-x)", xData, yData, errorBars);
series.setMarkerColor(Color.RED);
series.setMarker(SeriesMarker.SQUARE);
......
xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart03.java
+ 18
− 18
View file @ ff7aae61
......@@ -19,8 +19,8 @@ import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Date;
import java.util.List;
import com.xeiam.xchart.Chart;
import com.xeiam.xchart.ChartBuilder;
......@@ -56,9 +56,9 @@ public class ThemeChart03 implements ExampleChart {
chart.getStyleManager().setPlotGridLinesVisible(false);
chart.getStyleManager().setXAxisTickMarkSpacingHint(100);
// generate data
Collection<Date> xData = new ArrayList<Date>();
Collection<Number> y1Data = new ArrayList<Number>();
Collection<Number> y2Data = new ArrayList<Number>();
List<Date> xData = new ArrayList<Date>();
List<Double> y1Data = new ArrayList<Double>();
List<Double> y2Data = new ArrayList<Double>();
DateFormat sdf = new SimpleDateFormat("yyyy-MM");
......@@ -66,38 +66,38 @@ public class ThemeChart03 implements ExampleChart {
try {
date = sdf.parse("2012-08");
xData.add(date);
y1Data.add(120);
y2Data.add(15);
y1Data.add(120d);
y2Data.add(15d);
date = sdf.parse("2012-11");
xData.add(date);
y1Data.add(165);
y2Data.add(15);
y1Data.add(165d);
y2Data.add(15d);
date = sdf.parse("2013-01");
xData.add(date);
y1Data.add(210);
y2Data.add(20);
y1Data.add(210d);
y2Data.add(20d);
date = sdf.parse("2013-02");
xData.add(date);
y1Data.add(400);
y2Data.add(30);
y1Data.add(400d);
y2Data.add(30d);
date = sdf.parse("2013-03");
xData.add(date);
y1Data.add(800);
y2Data.add(100);
y1Data.add(800d);
y2Data.add(100d);
date = sdf.parse("2013-04");
xData.add(date);
y1Data.add(2000);
y2Data.add(120);
y1Data.add(2000d);
y2Data.add(120d);
date = sdf.parse("2013-05");
xData.add(date);
y1Data.add(3000);
y2Data.add(150);
y1Data.add(3000d);
y2Data.add(150d);
} catch (ParseException e) {
e.printStackTrace();
......
xchart/src/main/java/com/xeiam/xchart/Chart.java
+ 3
− 3
View file @ ff7aae61
......@@ -111,7 +111,7 @@ public class Chart {
* @param yData
* @return
*/
public Series addCategorySeries(String seriesName, Collection<String> xData, Collection<Number> yData) {
public Series addCategorySeries(String seriesName, Collection<String> xData, Collection<? extends Number> yData) {
return chartPainter.getAxisPair().addSeries(seriesName, xData, yData, null);
}
......@@ -124,7 +124,7 @@ public class Chart {
* @param yData the Y-Axis data
* @return A Series object that you can set properties on
*/
public Series addDateSeries(String seriesName, Collection<Date> xData, Collection<Number> yData) {
public Series addDateSeries(String seriesName, Collection<Date> xData, Collection<? extends Number> yData) {
return chartPainter.getAxisPair().addSeries(seriesName, xData, yData, null);
}
......@@ -138,7 +138,7 @@ public class Chart {
* @param errorBars the error bar data
* @return A Series object that you can set properties on
*/
public Series addDateSeries(String seriesName, Collection<Date> xData, Collection<Number> yData, Collection<Number> errorBars) {
public Series addDateSeries(String seriesName, Collection<Date> xData, Collection<? extends Number> yData, Collection<? extends Number> errorBars) {
return chartPainter.getAxisPair().addSeries(seriesName, xData, yData, errorBars);
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment