From 09f77ff65b11339dfa6534a43a69f25d0b64599e Mon Sep 17 00:00:00 2001
From: Tim Molter <tim@knowm.org>
Date: Tue, 26 Jan 2016 18:26:53 +0100
Subject: [PATCH] cleaned up demos
---
.../xchart/demo/charts/area/AreaChart01.java | 9 ++--
.../xchart/demo/charts/area/AreaChart02.java | 9 ++--
.../demo/charts/area/AreaLineChart03.java | 12 +++---
.../xchart/demo/charts/bar/BarChart01.java | 4 +-
.../xchart/demo/charts/bar/BarChart02.java | 9 ++--
.../xchart/demo/charts/bar/BarChart03.java | 4 ++
.../xchart/demo/charts/bar/BarChart04.java | 7 +++-
.../xchart/demo/charts/bar/BarChart05.java | 4 ++
.../xchart/demo/charts/bar/BarChart06.java | 11 ++---
.../xchart/demo/charts/bar/BarChart07.java | 10 ++---
.../xchart/demo/charts/bar/BarChart08.java | 7 ++--
.../xchart/demo/charts/bar/BarChart09.java | 12 +++---
.../xchart/demo/charts/date/DateChart01.java | 3 ++
.../xchart/demo/charts/date/DateChart02.java | 4 +-
.../xchart/demo/charts/date/DateChart03.java | 4 +-
.../xchart/demo/charts/date/DateChart04.java | 4 +-
.../xchart/demo/charts/date/DateChart05.java | 4 +-
.../xchart/demo/charts/date/DateChart06.java | 4 +-
.../xchart/demo/charts/date/DateChart07.java | 4 +-
.../xchart/demo/charts/date/DateChart08.java | 5 ++-
.../xchart/demo/charts/line/LineChart01.java | 2 +-
.../xchart/demo/charts/line/LineChart02.java | 27 ++++++------
.../xchart/demo/charts/line/LineChart03.java | 41 +++++++++----------
.../xchart/demo/charts/line/LineChart04.java | 8 ++--
.../xchart/demo/charts/line/LineChart05.java | 20 ++++-----
.../xchart/demo/charts/line/LineChart06.java | 21 ++++------
.../xchart/demo/charts/line/LineChart07.java | 10 ++---
.../xchart/demo/charts/pie/PieChart01.java | 4 ++
.../xchart/demo/charts/pie/PieChart02.java | 9 ++--
.../xchart/demo/charts/pie/PieChart03.java | 13 +++---
.../demo/charts/scatter/ScatterChart01.java | 5 ++-
.../demo/charts/scatter/ScatterChart02.java | 8 ++--
.../demo/charts/scatter/ScatterChart03.java | 8 +---
.../demo/charts/stick/StickChart01.java | 14 +++----
.../demo/charts/theme/ThemeChart01.java | 14 +++----
.../demo/charts/theme/ThemeChart02.java | 3 ++
.../demo/charts/theme/ThemeChart03.java | 5 ++-
37 files changed, 190 insertions(+), 152 deletions(-)
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
index e7ea6804..040d33c4 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
@@ -47,14 +47,17 @@ public class AreaChart01 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title(getClass().getSimpleName()).xAxisTitle("X").yAxisTitle("Y").build();
- chart.addSeries("a", new double[] { 0, 3, 5, 7, 9 }, new double[] { -3, 5, 9, 6, 5 });
- chart.addSeries("b", new double[] { 0, 2, 4, 6, 9 }, new double[] { -1, 6, 4, 0, 4 });
- chart.addSeries("c", new double[] { 0, 1, 3, 8, 9 }, new double[] { -2, -1, 1, 0, 1 });
// Customize Chart
chart.getStyler().setLegendPosition(LegendPosition.InsideNE);
chart.getStyler().setAxisTitlesVisible(false);
chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Area);
+
+ // Series
+ chart.addSeries("a", new double[] { 0, 3, 5, 7, 9 }, new double[] { -3, 5, 9, 6, 5 });
+ chart.addSeries("b", new double[] { 0, 2, 4, 6, 9 }, new double[] { -1, 6, 4, 0, 4 });
+ chart.addSeries("c", new double[] { 0, 1, 3, 8, 9 }, new double[] { -2, -1, 1, 0, 1 });
+
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
index 3a819675..5c2eb617 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
@@ -51,6 +51,11 @@ public class AreaChart02 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title(getClass().getSimpleName()).xAxisTitle("X").yAxisTitle("Y").build();
+ // Customize Chart
+ chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Area);
+ chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
+
+ // Series
List<Integer> xData = new ArrayList<Integer>();
List<Integer> yData = new ArrayList<Integer>();
for (int i = 0; i < 5; i++) {
@@ -73,10 +78,6 @@ public class AreaChart02 implements ExampleChart {
chart.addSeries("a", xData, yData);
- // Customize Chart
- chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Area);
- chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
-
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaLineChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaLineChart03.java
index d553bdb6..6867969c 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaLineChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaLineChart03.java
@@ -56,7 +56,12 @@ public class AreaLineChart03 implements ExampleChart {
chart.setYAxisTitle("Amount");
chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Line);
+ chart.getStyler().setYAxisLabelAlignment(Styler.TextAlignment.Right);
+ chart.getStyler().setYAxisDecimalPattern("$ #,###.##");
+ chart.getStyler().setPlotMargin(0);
+ chart.getStyler().setPlotContentSize(.95);
+ // Series
// @formatter:off
double[] xAges = new double[] { 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87,
88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100 };
@@ -90,13 +95,6 @@ public class AreaLineChart03 implements ExampleChart {
Series_XY seriesPercentile25th = chart.addSeries("25th Percentile", xAges, yPercentile25th);
seriesPercentile25th.setMarker(SeriesMarkers.NONE);
-
- chart.getStyler().setYAxisLabelAlignment(Styler.TextAlignment.Right);
- chart.getStyler().setYAxisDecimalPattern("$ #,###.##");
-
- chart.getStyler().setPlotMargin(0);
- chart.getStyler().setPlotContentSize(.95);
- // chart.getStyleManager().setYAxisMax(1620725 * 1.15); // We want to ensure there is a % of padding on the top of the chart
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart01.java
index 94ca7f9d..10fbf3eb 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart01.java
@@ -50,12 +50,14 @@ public class BarChart01 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Score Histogram").xAxisTitle("Score").yAxisTitle("Number").build();
- chart.addSeries("test 1", Arrays.asList(new Integer[] { 0, 1, 2, 3, 4 }), Arrays.asList(new Integer[] { 4, 5, 9, 6, 5 }));
// Customize Chart
chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
chart.getStyler().setPlotContentSize(1.0);
+ // Series
+ chart.addSeries("test 1", Arrays.asList(new Integer[] { 0, 1, 2, 3, 4 }), Arrays.asList(new Integer[] { 4, 5, 9, 6, 5 }));
+
return chart;
}
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart02.java
index 0a855449..e62f8362 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart02.java
@@ -60,6 +60,12 @@ public class BarChart02 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().theme(ChartTheme.Matlab).width(800).height(600).title("Units Sold Per Year").xAxisTitle("Year").yAxisTitle("Units Sold").build();
+ // Customize Chart
+ chart.getStyler().setPlotGridLinesVisible(false);
+ chart.getStyler().setBarFilled(false);
+ chart.getStyler().setDatePattern("YYYY");
+
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Number> yData = new ArrayList<Number>();
@@ -77,9 +83,6 @@ public class BarChart02 implements ExampleChart {
}
Series_Category series = chart.addSeries("Model 77", xData, yData);
series.setLineColor(MatlabSeriesColors.RED);
- chart.getStyler().setPlotGridLinesVisible(false);
- chart.getStyler().setBarFilled(false);
- chart.getStyler().setDatePattern("YYYY");
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart03.java
index dfdbe782..b5c84f0f 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart03.java
@@ -45,6 +45,10 @@ public class BarChart03 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Score vs. Age").xAxisTitle("Age").yAxisTitle("Score").build();
+
+ // Customize Chart
+
+ // Series
chart.addSeries("males", new int[] { 10, 20, 30, 40 }, new int[] { 40, -30, -20, -60 });
return chart;
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart04.java
index ac7517e7..1a787b51 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart04.java
@@ -49,12 +49,15 @@ public class BarChart04 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("XFactor vs. Age").xAxisTitle("Age").yAxisTitle("XFactor").build();
- chart.addSeries("female", Arrays.asList(new Integer[] { 10, 20, 30, 40, 50 }), Arrays.asList(new Integer[] { 50, 10, 20, 40, 35 }));
- chart.addSeries("male", Arrays.asList(new Integer[] { 10, 20, 30, 40, 50 }), Arrays.asList(new Integer[] { 40, 30, 20, null, 60 }));
+ // Customize Chart
chart.getStyler().setYAxisMin(5);
chart.getStyler().setYAxisMax(70);
+ // Series
+ chart.addSeries("female", Arrays.asList(new Integer[] { 10, 20, 30, 40, 50 }), Arrays.asList(new Integer[] { 50, 10, 20, 40, 35 }));
+ chart.addSeries("male", Arrays.asList(new Integer[] { 10, 20, 30, 40, 50 }), Arrays.asList(new Integer[] { 40, 30, 20, null, 60 }));
+
return chart;
}
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart05.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart05.java
index 23086e03..cb0d932d 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart05.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart05.java
@@ -49,6 +49,10 @@ public class BarChart05 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Temperature vs. Color").xAxisTitle("Color").yAxisTitle("Temperature").theme(ChartTheme.GGPlot2).build();
+
+ // Customize Chart
+
+ // Series
chart.addSeries("fish", new ArrayList<String>(Arrays.asList(new String[] { "Blue", "Red", "Green", "Yellow", "Orange" })), new ArrayList<Number>(Arrays.asList(new Number[] { -40, 30, 20, 60,
60 })));
chart.addSeries("worms", new ArrayList<String>(Arrays.asList(new String[] { "Blue", "Red", "Green", "Yellow", "Orange" })), new ArrayList<Number>(Arrays.asList(new Number[] { 50, 10, -20, 40,
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
index 07d92467..e7c8ce16 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
@@ -51,16 +51,17 @@ public class BarChart06 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Score Histogram").xAxisTitle("Mean").yAxisTitle("Count").build();
- Histogram histogram1 = new Histogram(getGaussianData(10000), 30, -30, 30);
- Histogram histogram2 = new Histogram(getGaussianData(5000), 30, -30, 30);
- chart.addSeries("histogram 1", histogram1.getxAxisData(), histogram1.getyAxisData());
- chart.addSeries("histogram 2", histogram2.getxAxisData(), histogram2.getyAxisData());
-
// Customize Chart
chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
chart.getStyler().setBarWidthPercentage(.96);
chart.getStyler().setBarsOverlapped(true);
+ // Series
+ Histogram histogram1 = new Histogram(getGaussianData(10000), 30, -30, 30);
+ Histogram histogram2 = new Histogram(getGaussianData(5000), 30, -30, 30);
+ chart.addSeries("histogram 1", histogram1.getxAxisData(), histogram1.getyAxisData());
+ chart.addSeries("histogram 2", histogram2.getxAxisData(), histogram2.getyAxisData());
+
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java
index 75447932..1295b6ec 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java
@@ -52,15 +52,16 @@ public class BarChart07 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Score Histogram").xAxisTitle("Mean").yAxisTitle("Count").build();
+ // Customize Chart
+ chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
+ chart.getStyler().setBarWidthPercentage(.96);
+
+ // Series
Histogram histogram1 = new Histogram(getGaussianData(1000), 10, -30, 30);
chart.addSeries("histogram 1", histogram1.getxAxisData(), histogram1.getyAxisData());
Histogram histogram2 = new Histogram(getGaussianData(1000), 10, -30, 30);
chart.addSeries("histogram 2", histogram2.getxAxisData(), histogram2.getyAxisData());
- // Customize Chart
- chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
- chart.getStyler().setBarWidthPercentage(.96);
-
return chart;
}
@@ -70,7 +71,6 @@ public class BarChart07 implements ExampleChart {
Random r = new Random();
for (int i = 0; i < count; i++) {
data.add((int) (r.nextGaussian() * 10));
- // data.add(r.nextDouble() * 60 - 30);
}
return data;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart08.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart08.java
index d31e5589..ee80a05c 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart08.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart08.java
@@ -51,13 +51,14 @@ public class BarChart08 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Histogram").xAxisTitle("Mean").yAxisTitle("Count").build();
- Histogram histogram1 = new Histogram(getGaussianData(10000), 10, -10, 10);
- chart.addSeries("histogram", histogram1.getxAxisData(), histogram1.getyAxisData(), getFakeErrorData(histogram1.getxAxisData().size()));
-
// Customize Chart
chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
chart.getStyler().setBarWidthPercentage(.96);
+ // Series
+ Histogram histogram1 = new Histogram(getGaussianData(10000), 10, -10, 10);
+ chart.addSeries("histogram", histogram1.getxAxisData(), histogram1.getyAxisData(), getFakeErrorData(histogram1.getxAxisData().size()));
+
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart09.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart09.java
index e4212a65..612e89c1 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart09.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart09.java
@@ -51,6 +51,13 @@ public class BarChart09 implements ExampleChart {
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Value vs. Letter").xAxisTitle("Letter").yAxisTitle("Value").theme(ChartTheme.GGPlot2).build();
+
+ // Customize Chart
+ chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
+ chart.getStyler().setBarWidthPercentage(.55);
+ chart.getStyler().setBarsOverlapped(true);
+
+ // Series
chart.addSeries("China", new ArrayList<String>(Arrays.asList(new String[] { "A", "B", "C", "D", "E" })), new ArrayList<Number>(Arrays.asList(new Number[] { 11, 23, 20, 36, 5 })));
Series_Category series2 = chart.addSeries("Korea", new ArrayList<String>(Arrays.asList(new String[] { "A", "B", "C", "D", "E" })), new ArrayList<Number>(Arrays.asList(new Number[] { 13, 25, 22,
38, 7 })), new ArrayList<Number>(Arrays.asList(new Number[] { 1, 3, 2, 1, 2 })));
@@ -59,11 +66,6 @@ public class BarChart09 implements ExampleChart {
18, 36, 32 })));
series3.setChartCategorySeriesRenderStyle(ChartCategorySeriesRenderStyle.Scatter);
- // Customize Chart
- chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
- chart.getStyler().setBarWidthPercentage(.55);
- chart.getStyler().setBarsOverlapped(true);
-
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
index 8b607455..8747e304 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
@@ -54,8 +54,11 @@ public class DateChart01 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Millisecond Scale").build();
+
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
+ // Series
Random random = new Random();
// generate data
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
index 7468de5f..fa88b5a4 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
@@ -47,9 +47,11 @@ public class DateChart02 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Second Scale").build();
+
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
- // generate data
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
index d3d70a9d..aa583918 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
@@ -47,9 +47,11 @@ public class DateChart03 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Minute Scale").build();
+
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
- // generate data
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
index b8b9b5ca..9e0dc25d 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
@@ -47,9 +47,11 @@ public class DateChart04 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Hour Scale").build();
+
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
- // generate data
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
index ae1cea16..824699be 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
@@ -47,9 +47,11 @@ public class DateChart05 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Day Scale").build();
+
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
- // generate data
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
index 5b0f3470..3445f164 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
@@ -47,9 +47,11 @@ public class DateChart06 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Month Scale").build();
+
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
- // generate data
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
index fcf751c5..e59ec60e 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
@@ -47,9 +47,11 @@ public class DateChart07 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Year Scale").build();
+
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
- // generate data
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
index 24b527a5..c8ac0ba3 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
@@ -52,10 +52,13 @@ public class DateChart08 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Rotated Tick Labels").build();
+
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
chart.getStyler().setXAxisLabelRotation(60);
chart.getStyler().setDatePattern("yyyy-MM-dd");
- // generate data
+
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Double> yData = new ArrayList<Double>();
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
index 9571bbea..6f504d18 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
@@ -62,8 +62,8 @@ public class LineChart01 implements ExampleChart {
chart.getStyler().setChartTitleVisible(true);
chart.getStyler().setLegendPosition(LegendPosition.InsideNW);
chart.getStyler().setYAxisLogarithmic(true);
- // chart.getStyleManager().setXAxisLabelAlignment(TextAlignment.Right);
chart.getStyler().setXAxisLabelRotation(45);
+ // chart.getStyleManager().setXAxisLabelAlignment(TextAlignment.Right);
// chart.getStyleManager().setXAxisLabelRotation(90);
// chart.getStyleManager().setXAxisLabelRotation(0);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart02.java
index a8d5d3bf..dd31905e 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart02.java
@@ -19,6 +19,7 @@ package org.knowm.xchart.demo.charts.line;
import java.util.ArrayList;
import java.util.List;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -47,6 +48,13 @@ public class LineChart02 implements ExampleChart {
@Override
public Chart getChart() {
+ // Create Chart
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).build();
+
+ // Customize Chart
+ chart.getStyler().setChartTitleVisible(false);
+ chart.getStyler().setLegendVisible(false);
+
// generates sine data
int size = 30;
List<Integer> xData = new ArrayList<Integer>();
@@ -57,19 +65,12 @@ public class LineChart02 implements ExampleChart {
yData.add(-.000001 * Math.sin(radians));
}
- // Create Chart
- Chart_XY chart = new Chart_XY(800, 600);
-
- // Customize Chart
- chart.getStyler().setChartTitleVisible(false);
- chart.getStyler().setLegendVisible(false);
-
- // Series 1
- Series_XY series1 = chart.addSeries("y=sin(x)", xData, yData);
- series1.setLineColor(XChartSeriesColors.PURPLE);
- series1.setLineStyle(SeriesLines.DASH_DASH);
- series1.setMarkerColor(XChartSeriesColors.GREEN);
- series1.setMarker(SeriesMarkers.SQUARE);
+ // Series
+ Series_XY series = chart.addSeries("y=sin(x)", xData, yData);
+ series.setLineColor(XChartSeriesColors.PURPLE);
+ series.setLineStyle(SeriesLines.DASH_DASH);
+ series.setMarkerColor(XChartSeriesColors.GREEN);
+ series.setMarker(SeriesMarkers.SQUARE);
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart03.java
index 5cd3fb80..ac54d75a 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart03.java
@@ -26,6 +26,7 @@ import java.util.Date;
import java.util.List;
import java.util.Locale;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -53,29 +54,9 @@ public class LineChart03 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new Chart_XY(800, 600);
-
- // generates linear data
- List<Date> xData = new ArrayList<Date>();
- List<Double> yData = new ArrayList<Double>();
-
- DateFormat sdf = new SimpleDateFormat("dd.MM.yyyy");
- Date date = null;
- for (int i = 1; i <= 10; i++) {
-
- try {
- date = sdf.parse(i + ".10.2008");
- } catch (ParseException e) {
- e.printStackTrace();
- }
- xData.add(date);
- yData.add(Math.random() * i);
- }
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("LineChart03").xAxisTitle("X").yAxisTitle("Y").build();
// Customize Chart
- chart.setTitle("LineChart03");
- chart.setXAxisTitle("X");
- chart.setYAxisTitle("Y");
chart.getStyler().setPlotBackgroundColor(ChartColor.getAWTColor(ChartColor.GREY));
chart.getStyler().setPlotGridLinesColor(new Color(255, 255, 255));
chart.getStyler().setChartBackgroundColor(Color.WHITE);
@@ -102,6 +83,24 @@ public class LineChart03 implements ExampleChart {
chart.getStyler().setDecimalPattern("#0.000");
chart.getStyler().setLocale(Locale.GERMAN);
+ // generates linear data
+ List<Date> xData = new ArrayList<Date>();
+ List<Double> yData = new ArrayList<Double>();
+
+ DateFormat sdf = new SimpleDateFormat("dd.MM.yyyy");
+ Date date = null;
+ for (int i = 1; i <= 10; i++) {
+
+ try {
+ date = sdf.parse(i + ".10.2008");
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+ xData.add(date);
+ yData.add(Math.random() * i);
+ }
+
+ // Series
Series_XY series = chart.addSeries("Fake Data", xData, yData);
series.setLineColor(XChartSeriesColors.BLUE);
series.setMarkerColor(Color.ORANGE);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart04.java
index 6d024a6d..2e7715b2 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart04.java
@@ -16,6 +16,7 @@
*/
package org.knowm.xchart.demo.charts.line;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -41,21 +42,18 @@ public class LineChart04 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new Chart_XY(800, 600);
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("LineChart04").xAxisTitle("X").yAxisTitle("Y").build();
// Customize Chart
- chart.setTitle("LineChart04");
- chart.setXAxisTitle("X");
- chart.setYAxisTitle("Y");
chart.getStyler().setLegendVisible(false);
+ // Series
for (int i = 0; i < 200; i++) {
Series_XY series = chart.addSeries("A" + i, new double[] { Math.random() / 1000, Math.random() / 1000 }, new double[] { Math.random() / -1000, Math.random() / -1000 });
series.setLineColor(XChartSeriesColors.BLUE);
series.setLineStyle(SeriesLines.SOLID);
series.setMarker(SeriesMarkers.CIRCLE);
series.setMarkerColor(XChartSeriesColors.BLUE);
-
}
return chart;
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart05.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart05.java
index 6cf8e42a..8b17a737 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart05.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart05.java
@@ -18,6 +18,7 @@ package org.knowm.xchart.demo.charts.line;
import java.awt.Color;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -50,14 +51,17 @@ public class LineChart05 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new Chart_XY(800, 600);
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("LineChart05").xAxisTitle("X").yAxisTitle("Y").build();
// Customize Chart
- chart.setTitle("LineChart05");
- chart.setXAxisTitle("X");
- chart.setYAxisTitle("Y");
chart.getStyler().setLegendPosition(LegendPosition.InsideSW);
+ chart.getStyler().setYAxisLogarithmic(true);
+ chart.getStyler().setYAxisMin(0.01);
+ chart.getStyler().setYAxisMax(1000);
+ chart.getStyler().setXAxisMin(2);
+ chart.getStyler().setXAxisMax(7);
+ // Series
double[] xData = new double[] { 0.0, 1.0, 2.0, 3.0, 4.0, 5, 6 };
double[] yData = new double[] { 106, 44, 26, 10, 7.5, 3.4, .88 };
double[] yData2 = new double[] { 102, 49, 23.6, 11.3, 5.4, 2.6, 1.25 };
@@ -72,14 +76,6 @@ public class LineChart05 implements ExampleChart {
series2.setLineStyle(SeriesLines.DASH_DASH);
series2.setLineColor(Color.BLACK);
- chart.getStyler().setYAxisLogarithmic(true);
-
- chart.getStyler().setYAxisMin(0.01);
- chart.getStyler().setYAxisMax(1000);
-
- chart.getStyler().setXAxisMin(2);
- chart.getStyler().setXAxisMax(7);
-
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart06.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart06.java
index 59ab0cac..17d8ce02 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart06.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart06.java
@@ -18,6 +18,7 @@ package org.knowm.xchart.demo.charts.line;
import java.awt.Color;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY;
import org.knowm.xchart.SwingWrapper;
@@ -48,28 +49,22 @@ public class LineChart06 implements ExampleChart {
@Override
public Chart getChart() {
- int[] xData = new int[] { 0, 1, 2, 3, 4, 5, 6 };
-
- int[] yData1 = new int[] { 100, 100, 100, 60, 10, 10, 10 };
-
- int[] errdata = new int[] { 50, 20, 10, 52, 9, 2, 1 };
-
- Chart_XY chart = new Chart_XY(800, 600);
+ // Create Chart
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).build();
+ // Customize Chart
chart.getStyler().setYAxisLogarithmic(true);
-
chart.getStyler().setYAxisMin(.08);
-
chart.getStyler().setYAxisMax(1000);
-
chart.getStyler().setErrorBarsColor(Color.black);
+ // Series
+ int[] xData = new int[] { 0, 1, 2, 3, 4, 5, 6 };
+ int[] yData1 = new int[] { 100, 100, 100, 60, 10, 10, 10 };
+ int[] errdata = new int[] { 50, 20, 10, 52, 9, 2, 1 };
Series_XY series1 = chart.addSeries("Error bar\ntest data", xData, yData1, errdata);
-
series1.setLineStyle(SeriesLines.SOLID);
-
series1.setMarker(SeriesMarkers.DIAMOND);
-
series1.setMarkerColor(Color.GREEN);
return chart;
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart07.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart07.java
index 79f67c21..c317486d 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart07.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart07.java
@@ -19,6 +19,7 @@ package org.knowm.xchart.demo.charts.line;
import java.util.Arrays;
import java.util.List;
+import org.knowm.xchart.ChartBuilder_Category;
import org.knowm.xchart.Chart_Category;
import org.knowm.xchart.Series_Category;
import org.knowm.xchart.Series_Category.ChartCategorySeriesRenderStyle;
@@ -51,13 +52,10 @@ public class LineChart07 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_Category chart = new Chart_Category(1024, 768, ChartTheme.GGPlot2);
- chart.getStyler().setChartCategorySeriesRenderStyle(ChartCategorySeriesRenderStyle.Line);
+ Chart_Category chart = new ChartBuilder_Category().width(800).height(600).theme(ChartTheme.GGPlot2).title("ThreadPool Benchmark").xAxisTitle("Threads").yAxisTitle("Executions").build();
// Customize Chart
- chart.setTitle("ThreadPoolBenchmark");
- chart.setXAxisTitle("Threads");
- chart.setYAxisTitle("Executions");
+ chart.getStyler().setChartCategorySeriesRenderStyle(ChartCategorySeriesRenderStyle.Line);
chart.getStyler().setXAxisLabelRotation(270);
chart.getStyler().setLegendPosition(LegendPosition.OutsideE);
chart.getStyler().setBarWidthPercentage(0);
@@ -94,7 +92,7 @@ public class LineChart07 implements ExampleChart {
119480, 119269, 118983, 119290, 119304, 119161, 119875, 118830, 119517, 119980, 119502, 120883, 118953, 119461, 120753, 120526, 120967,
120244, 122381, 121084, 122404, 121761, 121546, 161230, 160123, 160534 } };
- // Add data series to chart
+ // Series
for (int i = 0; i < seriesNames.length; i++) {
Series_Category series = chart.addSeries(seriesNames[i], xAxisKeys, Arrays.asList(dataPerSeries[i]));
series.setMarker(SeriesMarkers.NONE);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java
index 3ff1032e..acb64835 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart01.java
@@ -43,6 +43,10 @@ public class PieChart01 implements ExampleChart<Chart_Pie> {
// Create Chart
Chart_Pie chart = new ChartBuilder_Pie().width(400).height(500).title(getClass().getSimpleName()).build();
+
+ // Customize Chart
+
+ // Series
chart.addSeries("Pennies", 100);
chart.addSeries("Nickels", 100);
chart.addSeries("Dimes", 100);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java
index 2e3ff914..a4abc2c2 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart02.java
@@ -46,15 +46,18 @@ public class PieChart02 implements ExampleChart<Chart_Pie> {
// Create Chart
Chart_Pie chart = new ChartBuilder_Pie().width(800).height(600).title(getClass().getSimpleName()).build();
+
+ // Customize Chart
+ Color[] sliceColors = new Color[] { new Color(224, 68, 14), new Color(230, 105, 62), new Color(236, 143, 110), new Color(243, 180, 159), new Color(246, 199, 182) };
+ chart.getStyler().setSeriesColors(sliceColors);
+
+ // Series
chart.addSeries("Gold", 24);
chart.addSeries("Silver", 21);
chart.addSeries("Platinum", 39);
chart.addSeries("Copper", 17);
chart.addSeries("Zinc", 40);
- Color[] sliceColors = new Color[] { new Color(224, 68, 14), new Color(230, 105, 62), new Color(236, 143, 110), new Color(243, 180, 159), new Color(246, 199, 182) };
- chart.getStyler().setSeriesColors(sliceColors);
-
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart03.java
index 7028df25..c9e8de4a 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/pie/PieChart03.java
@@ -46,17 +46,20 @@ public class PieChart03 implements ExampleChart<Chart_Pie> {
// Create Chart
Chart_Pie chart = new ChartBuilder_Pie().width(400).height(500).title(getClass().getSimpleName()).theme(ChartTheme.GGPlot2).build();
- chart.addSeries("Prague", 2);
- chart.addSeries("Dresden", 4);
- chart.addSeries("Munich", 34);
- chart.addSeries("Hamburg", 22);
- chart.addSeries("Berlin", 29);
+ // Customize Chart
chart.getStyler().setLegendVisible(false);
chart.getStyler().setAnnotationType(AnnotationType.LabelAndPercentage);
chart.getStyler().setAnnotationDistance(1.15);
chart.getStyler().setPlotContentSize(.7);
+ // Series
+ chart.addSeries("Prague", 2);
+ chart.addSeries("Dresden", 4);
+ chart.addSeries("Munich", 34);
+ chart.addSeries("Hamburg", 22);
+ chart.addSeries("Berlin", 29);
+
return chart;
}
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart01.java
index 6ecbef2c..4fbf6b27 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart01.java
@@ -20,6 +20,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Random;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY.ChartXYSeriesRenderStyle;
import org.knowm.xchart.SwingWrapper;
@@ -59,10 +60,10 @@ public class ScatterChart01 implements ExampleChart {
}
// Create Chart
- Chart_XY chart = new Chart_XY(800, 600);
- chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Scatter);
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).build();
// Customize Chart
+ chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Scatter);
chart.getStyler().setChartTitleVisible(false);
chart.getStyler().setLegendPosition(LegendPosition.InsideSW);
chart.getStyler().setMarkerSize(16);
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart02.java
index 230cb384..0713fbc7 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart02.java
@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.Series_XY.ChartXYSeriesRenderStyle;
import org.knowm.xchart.SwingWrapper;
@@ -62,12 +63,11 @@ public class ScatterChart02 implements ExampleChart {
}
// Create Chart
- Chart_XY chart = new Chart_XY(800, 600);
- chart.setTitle("Logarithmic Data");
- chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Scatter);
- chart.getStyler().setXAxisLogarithmic(true);
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Logarithmic Data").build();
// Customize Chart
+ chart.getStyler().setChartXYSeriesRenderStyle(ChartXYSeriesRenderStyle.Scatter);
+ chart.getStyler().setXAxisLogarithmic(true);
chart.getStyler().setLegendPosition(LegendPosition.InsideN);
// Series
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart03.java
index 8533ebff..8150416a 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart03.java
@@ -16,6 +16,7 @@
*/
package org.knowm.xchart.demo.charts.scatter;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
@@ -41,12 +42,7 @@ public class ScatterChart03 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new Chart_XY(800, 600);
-
- // Customize Chart
- chart.setTitle("Single Point");
- chart.setXAxisTitle("X");
- chart.setYAxisTitle("Y");
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Single Point").xAxisTitle("X").yAxisTitle("Y").build();
chart.addSeries("single point (1,1)", new double[] { 1 }, new double[] { 1 });
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/stick/StickChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/stick/StickChart01.java
index cd73181d..b9c2c637 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/stick/StickChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/stick/StickChart01.java
@@ -45,14 +45,6 @@ public class StickChart01 implements ExampleChart {
@Override
public Chart getChart() {
- // generates Log data
- List<Integer> xData = new ArrayList<Integer>();
- List<Integer> yData = new ArrayList<Integer>();
- for (int i = -3; i <= 24; i++) {
- xData.add(i);
- yData.add(i);
- }
-
// Create Chart
Chart_Category chart = new ChartBuilder_Category().width(800).height(600).title("Stick").build();
@@ -62,6 +54,12 @@ public class StickChart01 implements ExampleChart {
chart.getStyler().setChartCategorySeriesRenderStyle(ChartCategorySeriesRenderStyle.Stick);
// Series
+ List<Integer> xData = new ArrayList<Integer>();
+ List<Integer> yData = new ArrayList<Integer>();
+ for (int i = -3; i <= 24; i++) {
+ xData.add(i);
+ yData.add(i);
+ }
chart.addSeries("data", xData, yData);
return chart;
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart01.java
index ac794c78..5181e06e 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart01.java
@@ -19,10 +19,12 @@ package org.knowm.xchart.demo.charts.theme;
import java.util.ArrayList;
import java.util.List;
+import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
import org.knowm.xchart.internal.chartpart.Chart;
+import org.knowm.xchart.internal.style.Styler.ChartTheme;
/**
* Default XChart Theme
@@ -44,8 +46,12 @@ public class ThemeChart01 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new Chart_XY(800, 600);
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).theme(ChartTheme.XChart).title("XChart Theme").xAxisTitle("X").yAxisTitle("Y").build();
+ // Customize Chart
+ chart.getStyler().setMarkerSize(11);
+
+ // Series
for (int i = 1; i <= 14; i++) {
// generates linear data
@@ -57,14 +63,8 @@ public class ThemeChart01 implements ExampleChart {
yData.add(2 * i * x - i * b);
}
- // Customize Chart
- chart.setTitle("XChart Theme");
- chart.setXAxisTitle("X");
- chart.setYAxisTitle("Y");
-
String seriesName = "y=" + 2 * i + "x-" + i * b + "b";
chart.addSeries(seriesName, xData, yData);
- chart.getStyler().setMarkerSize(11);
}
return chart;
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
index 868e25d3..9c003ccc 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
@@ -47,6 +47,9 @@ public class ThemeChart02 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).theme(ChartTheme.GGPlot2).title("GGPlot2 Theme").xAxisTitle("X").yAxisTitle("Y").build();
+ // Customize Chart
+
+ // Series
chart.addSeries("vertical", new double[] { 1, 1 }, new double[] { -10, 10 });
chart.addSeries("horizontal", new double[] { -10, 10 }, new double[] { 0, 0 });
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
index 38b28ee8..4e1e71e2 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
@@ -53,9 +53,12 @@ public class ThemeChart03 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).theme(ChartTheme.Matlab).title("Matlab Theme").xAxisTitle("X").yAxisTitle("Y").build();
+
+ // Customize Chart
chart.getStyler().setPlotGridLinesVisible(false);
chart.getStyler().setXAxisTickMarkSpacingHint(100);
- // generate data
+
+ // Series
List<Date> xData = new ArrayList<Date>();
List<Double> y1Data = new ArrayList<Double>();
List<Double> y2Data = new ArrayList<Double>();
--
GitLab