From 71490aed3fffd8f3ed3338a011457d6f047672bf Mon Sep 17 00:00:00 2001
From: Tim Molter <tim@knowm.org>
Date: Wed, 27 Jan 2016 13:16:22 +0100
Subject: [PATCH] minor example code clean up
---
.../xchart/demo/charts/bar/BarChart01.java | 2 +-
.../xchart/demo/charts/line/LineChart03.java | 5 +++++
.../demo/charts/scatter/ScatterChart01.java | 17 +++++++-------
.../demo/charts/scatter/ScatterChart02.java | 19 ++++++++--------
.../demo/charts/scatter/ScatterChart03.java | 5 +++++
.../demo/charts/scatter/ScatterChart04.java | 22 +++++++++----------
.../demo/charts/theme/ThemeChart02.java | 2 +-
7 files changed, 40 insertions(+), 32 deletions(-)
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 10fbf3eb..28c56819 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
@@ -34,7 +34,7 @@ import org.knowm.xchart.internal.style.Styler.LegendPosition;
* <li>All positive values
* <li>Single series
* <li>Place legend at Inside-NW position
- * <li>Bars touch X-Axis
+ * <li>Bars span 100% allowed space
*/
public class BarChart01 implements ExampleChart {
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 ac54d75a..1b30f5c6 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
@@ -39,6 +39,11 @@ import org.knowm.xchart.internal.style.lines.SeriesLines;
import org.knowm.xchart.internal.style.markers.SeriesMarkers;
/**
+ * Customized Chart
+ * <p>
+ * Demonstrates the following:
+ * <ul>
+ * <li>
* Extensive Chart Customization
*/
public class LineChart03 implements ExampleChart {
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 8b896734..f9521fa9 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
@@ -50,15 +50,6 @@ public class ScatterChart01 implements ExampleChart {
@Override
public Chart getChart() {
- List<Double> xData = new LinkedList<Double>();
- List<Double> yData = new LinkedList<Double>();
- Random random = new Random();
- int size = 1000;
- for (int i = 0; i < size; i++) {
- xData.add(random.nextGaussian() / 1000);
- yData.add(-1000000 + random.nextGaussian());
- }
-
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).build();
@@ -69,6 +60,14 @@ public class ScatterChart01 implements ExampleChart {
chart.getStyler().setMarkerSize(16);
// Series
+ List<Double> xData = new LinkedList<Double>();
+ List<Double> yData = new LinkedList<Double>();
+ Random random = new Random();
+ int size = 1000;
+ for (int i = 0; i < size; i++) {
+ xData.add(random.nextGaussian() / 1000);
+ yData.add(-1000000 + random.nextGaussian());
+ }
chart.addSeries("Gaussian Blob", xData, yData);
return chart;
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 efac03e4..2b4cc2fe 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
@@ -52,16 +52,6 @@ public class ScatterChart02 implements ExampleChart {
@Override
public Chart getChart() {
- 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++) {
- double nextRandom = random.nextDouble();
- xData.add(Math.pow(10, nextRandom * 10));
- yData.add(1000000000.0 + nextRandom);
- }
-
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Logarithmic Data").build();
@@ -71,6 +61,15 @@ public class ScatterChart02 implements ExampleChart {
chart.getStyler().setLegendPosition(LegendPosition.InsideN);
// Series
+ 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++) {
+ double nextRandom = random.nextDouble();
+ xData.add(Math.pow(10, nextRandom * 10));
+ yData.add(1000000000.0 + nextRandom);
+ }
chart.addSeries("logarithmic data", xData, yData);
return chart;
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 8150416a..e7448801 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
@@ -18,6 +18,7 @@ package org.knowm.xchart.demo.charts.scatter;
import org.knowm.xchart.ChartBuilder_XY;
import org.knowm.xchart.Chart_XY;
+import org.knowm.xchart.Series_XY.ChartXYSeriesRenderStyle;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
import org.knowm.xchart.internal.chartpart.Chart;
@@ -44,6 +45,10 @@ public class ScatterChart03 implements ExampleChart {
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("Single Point").xAxisTitle("X").yAxisTitle("Y").build();
+ // Customize Chart
+ chart.getStyler().setDefaultSeriesRenderStyle(ChartXYSeriesRenderStyle.Scatter);
+
+ // Series
chart.addSeries("single point (1,1)", new double[] { 1 }, new double[] { 1 });
return chart;
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
index 5c4cbeaf..67440096 100644
--- a/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
@@ -23,6 +23,7 @@ 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.Series_XY.ChartXYSeriesRenderStyle;
import org.knowm.xchart.SwingWrapper;
import org.knowm.xchart.demo.charts.ExampleChart;
import org.knowm.xchart.internal.chartpart.Chart;
@@ -51,27 +52,26 @@ public class ScatterChart04 implements ExampleChart {
@Override
public Chart getChart() {
- // generates data
- int size = 10;
- List<Double> xData = new ArrayList<Double>();
- List<Double> yData = new ArrayList<Double>();
- List<Double> errorBars = new ArrayList<Double>();
- for (int i = 0; i <= size; i++) {
- xData.add(((double) i) / 1000000);
- yData.add(10 * Math.exp(-i));
- errorBars.add(Math.random() + .3);
- }
-
// Create Chart
Chart_XY chart = new ChartBuilder_XY().width(800).height(600).title("ScatterChart04").xAxisTitle("X").yAxisTitle("Y").build();
// Customize Chart
+ chart.getStyler().setDefaultSeriesRenderStyle(ChartXYSeriesRenderStyle.Scatter);
chart.getStyler().setChartTitleVisible(false);
chart.getStyler().setLegendVisible(false);
chart.getStyler().setAxisTitlesVisible(false);
chart.getStyler().setXAxisDecimalPattern("0.0000000");
// Series
+ int size = 10;
+ List<Double> xData = new ArrayList<Double>();
+ List<Double> yData = new ArrayList<Double>();
+ List<Double> errorBars = new ArrayList<Double>();
+ for (int i = 0; i <= size; i++) {
+ xData.add(((double) i) / 1000000);
+ yData.add(10 * Math.exp(-i));
+ errorBars.add(Math.random() + .3);
+ }
Series_XY series = chart.addSeries("10^(-x)", xData, yData, errorBars);
series.setMarkerColor(Color.RED);
series.setMarker(SeriesMarkers.SQUARE);
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 9c003ccc..32b1c846 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
@@ -45,7 +45,7 @@ public class ThemeChart02 implements ExampleChart {
public Chart getChart() {
// Create Chart
- Chart_XY chart = new ChartBuilder_XY().width(800).height(600).theme(ChartTheme.GGPlot2).title("GGPlot2 Theme").xAxisTitle("X").yAxisTitle("Y").build();
+ Chart_XY chart = new ChartBuilder_XY().width(800).height(600).theme(ChartTheme.Matlab).title("Matlab Theme").xAxisTitle("X").yAxisTitle("Y").build();
// Customize Chart
--
GitLab