From 3e2019bdd727aefba74a4fd551df2f7fdb07ba42 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Tue, 5 Mar 2013 20:53:56 +0100
Subject: [PATCH] cleaned up examples
---
README.md | 17 +++++---
.../xchart/demo/charts/area/AreaChart01.java | 10 +++--
.../xchart/demo/charts/bar/BarChart05.java | 3 +-
.../xchart/demo/charts/date/DateChart02.java | 2 -
.../xchart/demo/charts/date/DateChart03.java | 2 -
.../xchart/demo/charts/date/DateChart04.java | 2 -
.../xchart/demo/charts/date/DateChart05.java | 2 -
.../xchart/demo/charts/date/DateChart06.java | 2 -
.../xchart/demo/charts/date/DateChart07.java | 2 -
.../demo/charts/scatter/ScatterChart01.java | 3 +-
.../xeiam/xchart/standalone}/Example0.java | 6 +--
.../xeiam/xchart/standalone}/Example1.java | 4 +-
.../xeiam/xchart/standalone}/Example2.java | 2 +-
.../DateAxisTickCalculatorTest.java | 2 +-
.../xchart/{unit => }/DateFormatterTest.java | 2 +-
.../DecimalAxisTickCalculatorTest.java | 2 +-
.../{unit => }/NumberFormatterTest.java | 2 +-
.../com/xeiam/xchart/chart/LineChart05.java | 43 -------------------
.../com/xeiam/xchart/chart/LineChart06.java | 43 -------------------
19 files changed, 31 insertions(+), 120 deletions(-)
rename {xchart/src/test/java/com/xeiam/xchart/chart => xchart-demo/src/main/java/com/xeiam/xchart/standalone}/Example0.java (90%)
rename {xchart/src/test/java/com/xeiam/xchart/chart => xchart-demo/src/main/java/com/xeiam/xchart/standalone}/Example1.java (95%)
rename {xchart/src/test/java/com/xeiam/xchart/chart => xchart-demo/src/main/java/com/xeiam/xchart/standalone}/Example2.java (97%)
rename xchart/src/test/java/com/xeiam/xchart/{unit => }/DateAxisTickCalculatorTest.java (98%)
rename xchart/src/test/java/com/xeiam/xchart/{unit => }/DateFormatterTest.java (99%)
rename xchart/src/test/java/com/xeiam/xchart/{unit => }/DecimalAxisTickCalculatorTest.java (98%)
rename xchart/src/test/java/com/xeiam/xchart/{unit => }/NumberFormatterTest.java (99%)
delete mode 100644 xchart/src/test/java/com/xeiam/xchart/chart/LineChart05.java
delete mode 100644 xchart/src/test/java/com/xeiam/xchart/chart/LineChart06.java
diff --git a/README.md b/README.md
index 2cce4bc0..e4eedef2 100644
--- a/README.md
+++ b/README.md
@@ -26,13 +26,20 @@ Now go ahead and [study some more examples](http://xeiam.com/xchart_examplecode.
## Features
* No additional dependencies
-* ~50KB Jar
+* ~85KB Jar
* Line charts
* Scatter charts
+* Area Charts
+* Bar Charts
* Error bars
-* Date x-axis
+* Logarithmic axes
+* Date and category X-Axis
* Multiple series
* Extensive customization
+* Themes
+* Right-click, Save-As...
+* User-defined axes range
+* Custom legend placement
## Getting Started
### Non-Maven
@@ -46,7 +53,7 @@ Add the XChart library as a dependency to your pom.xml file:
<dependency>
<groupId>com.xeiam.xchart</groupId>
<artifactId>xchart</artifactId>
- <version>1.3.1</version>
+ <version>2.0.0</version>
</dependency>
For snapshots, add the following to your pom.xml file:
@@ -60,7 +67,7 @@ For snapshots, add the following to your pom.xml file:
<dependency>
<groupId>com.xeiam</groupId>
<artifactId>xchart</artifactId>
- <version>1.3.2-SNAPSHOT</version>
+ <version>2.0.1-SNAPSHOT</version>
</dependency>
## Building
@@ -69,7 +76,7 @@ mvn javadoc:aggregate
## Running Demo
cd /path/to/xchart-demo/jar/
- java -cp xchart-demo-1.3.1.jar:xchart-1.3.1.jar com.xeiam.xchart.demo.XChartDemo
+ java -cp xchart-demo-2.0.0.jar:xchart-2.0.0.jar com.xeiam.xchart.demo.XChartDemo
## Bugs
Please report any bugs or submit feature requests to [XChart's Github issue tracker](https://github.com/timmolter/XChart/issues).
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java
index 3a4fff47..5b6a061a 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java
@@ -23,9 +23,13 @@ import com.xeiam.xchart.SwingWrapper;
import com.xeiam.xchart.demo.charts.ExampleChart;
/**
- * 3-Series
- *
- * @author timmolter
+ * Area Chart with 3 series
+ * <p>
+ * Demonstrates the following:
+ * <ul>
+ * <li>Area Chart
+ * <li>Place legend at Inside-NW position
+ * <li>ChartBuilder
*/
public class AreaChart01 implements ExampleChart {
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart05.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart05.java
index 45dc5ad1..1411cfbe 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart05.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart05.java
@@ -26,12 +26,13 @@ import java.util.Arrays;
import com.xeiam.xchart.Chart;
import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
import com.xeiam.xchart.StyleManager.ChartTheme;
import com.xeiam.xchart.StyleManager.ChartType;
+import com.xeiam.xchart.SwingWrapper;
import com.xeiam.xchart.demo.charts.ExampleChart;
/**
+ * Multiple series Bar Chart
* <p>
* Demonstrates the following:
* <ul>
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java
index d2312070..e60b12b8 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java
@@ -30,8 +30,6 @@ import com.xeiam.xchart.demo.charts.ExampleChart;
/**
* Second Scale
- *
- * @author timmolter
*/
public class DateChart02 implements ExampleChart {
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java
index bcc34e81..ab3ead7b 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java
@@ -30,8 +30,6 @@ import com.xeiam.xchart.demo.charts.ExampleChart;
/**
* Minute Scale
- *
- * @author timmolter
*/
public class DateChart03 implements ExampleChart {
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java
index 9cd21ee3..df8eb34a 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java
@@ -30,8 +30,6 @@ import com.xeiam.xchart.demo.charts.ExampleChart;
/**
* Hour Scale
- *
- * @author timmolter
*/
public class DateChart04 implements ExampleChart {
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java
index dcbfce3f..e72d267f 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java
@@ -30,8 +30,6 @@ import com.xeiam.xchart.demo.charts.ExampleChart;
/**
* Day Scale
- *
- * @author timmolter
*/
public class DateChart05 implements ExampleChart {
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java
index a363bd52..803b4dcf 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java
@@ -30,8 +30,6 @@ import com.xeiam.xchart.demo.charts.ExampleChart;
/**
* Month scale
- *
- * @author timmolter
*/
public class DateChart06 implements ExampleChart {
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java
index 6b96f223..b089406f 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java
@@ -30,8 +30,6 @@ import com.xeiam.xchart.demo.charts.ExampleChart;
/**
* Year scale
- *
- * @author timmolter
*/
public class DateChart07 implements ExampleChart {
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
index b40e0d5c..14e5ee16 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
@@ -20,9 +20,9 @@ import java.util.List;
import java.util.Random;
import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.SwingWrapper;
import com.xeiam.xchart.StyleManager.ChartType;
import com.xeiam.xchart.StyleManager.LegendPosition;
+import com.xeiam.xchart.SwingWrapper;
import com.xeiam.xchart.demo.charts.ExampleChart;
/**
@@ -58,6 +58,7 @@ public class ScatterChart01 implements ExampleChart {
// Customize Chart
chart.getStyleManager().setChartTitleVisible(false);
chart.getStyleManager().setLegendPosition(LegendPosition.InsideSW);
+
// Series
chart.addSeries("Gaussian Blob", xData, yData);
diff --git a/xchart/src/test/java/com/xeiam/xchart/chart/Example0.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example0.java
similarity index 90%
rename from xchart/src/test/java/com/xeiam/xchart/chart/Example0.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example0.java
index 3708c8d0..70679072 100644
--- a/xchart/src/test/java/com/xeiam/xchart/chart/Example0.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example0.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.xeiam.xchart.chart;
+package com.xeiam.xchart.standalone;
import com.xeiam.xchart.BitmapEncoder;
import com.xeiam.xchart.Chart;
@@ -21,9 +21,7 @@ import com.xeiam.xchart.QuickChart;
import com.xeiam.xchart.SwingWrapper;
/**
- * Creates a simple Chart using {@link com.xeiam.xchart.QuickChart}
- *
- * @author timmolter
+ * Creates a simple Chart using QuickChart
*/
public class Example0 {
diff --git a/xchart/src/test/java/com/xeiam/xchart/chart/Example1.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example1.java
similarity index 95%
rename from xchart/src/test/java/com/xeiam/xchart/chart/Example1.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example1.java
index 5dcb57f5..bb791b57 100644
--- a/xchart/src/test/java/com/xeiam/xchart/chart/Example1.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example1.java
@@ -13,15 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.xeiam.xchart.chart;
+package com.xeiam.xchart.standalone;
import com.xeiam.xchart.BitmapEncoder;
import com.xeiam.xchart.Chart;
/**
* Creates a simple Chart and saves it as a PNG and JPEG image file.
- *
- * @author timmolter
*/
public class Example1 {
diff --git a/xchart/src/test/java/com/xeiam/xchart/chart/Example2.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example2.java
similarity index 97%
rename from xchart/src/test/java/com/xeiam/xchart/chart/Example2.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example2.java
index 07258eae..7a272481 100644
--- a/xchart/src/test/java/com/xeiam/xchart/chart/Example2.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example2.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.xeiam.xchart.chart;
+package com.xeiam.xchart.standalone;
import java.util.ArrayList;
import java.util.List;
diff --git a/xchart/src/test/java/com/xeiam/xchart/unit/DateAxisTickCalculatorTest.java b/xchart/src/test/java/com/xeiam/xchart/DateAxisTickCalculatorTest.java
similarity index 98%
rename from xchart/src/test/java/com/xeiam/xchart/unit/DateAxisTickCalculatorTest.java
rename to xchart/src/test/java/com/xeiam/xchart/DateAxisTickCalculatorTest.java
index 081d8816..0c68fbec 100644
--- a/xchart/src/test/java/com/xeiam/xchart/unit/DateAxisTickCalculatorTest.java
+++ b/xchart/src/test/java/com/xeiam/xchart/DateAxisTickCalculatorTest.java
@@ -19,7 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-package com.xeiam.xchart.unit;
+package com.xeiam.xchart;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/xchart/src/test/java/com/xeiam/xchart/unit/DateFormatterTest.java b/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
similarity index 99%
rename from xchart/src/test/java/com/xeiam/xchart/unit/DateFormatterTest.java
rename to xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
index 3386bb37..3c18161d 100644
--- a/xchart/src/test/java/com/xeiam/xchart/unit/DateFormatterTest.java
+++ b/xchart/src/test/java/com/xeiam/xchart/DateFormatterTest.java
@@ -19,7 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-package com.xeiam.xchart.unit;
+package com.xeiam.xchart;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/xchart/src/test/java/com/xeiam/xchart/unit/DecimalAxisTickCalculatorTest.java b/xchart/src/test/java/com/xeiam/xchart/DecimalAxisTickCalculatorTest.java
similarity index 98%
rename from xchart/src/test/java/com/xeiam/xchart/unit/DecimalAxisTickCalculatorTest.java
rename to xchart/src/test/java/com/xeiam/xchart/DecimalAxisTickCalculatorTest.java
index 3b4f8e76..8366058a 100644
--- a/xchart/src/test/java/com/xeiam/xchart/unit/DecimalAxisTickCalculatorTest.java
+++ b/xchart/src/test/java/com/xeiam/xchart/DecimalAxisTickCalculatorTest.java
@@ -19,7 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-package com.xeiam.xchart.unit;
+package com.xeiam.xchart;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/xchart/src/test/java/com/xeiam/xchart/unit/NumberFormatterTest.java b/xchart/src/test/java/com/xeiam/xchart/NumberFormatterTest.java
similarity index 99%
rename from xchart/src/test/java/com/xeiam/xchart/unit/NumberFormatterTest.java
rename to xchart/src/test/java/com/xeiam/xchart/NumberFormatterTest.java
index 12ad0922..3e9e221e 100644
--- a/xchart/src/test/java/com/xeiam/xchart/unit/NumberFormatterTest.java
+++ b/xchart/src/test/java/com/xeiam/xchart/NumberFormatterTest.java
@@ -19,7 +19,7 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*/
-package com.xeiam.xchart.unit;
+package com.xeiam.xchart;
import static org.hamcrest.CoreMatchers.equalTo;
import static org.hamcrest.MatcherAssert.assertThat;
diff --git a/xchart/src/test/java/com/xeiam/xchart/chart/LineChart05.java b/xchart/src/test/java/com/xeiam/xchart/chart/LineChart05.java
deleted file mode 100644
index a8ede1e9..00000000
--- a/xchart/src/test/java/com/xeiam/xchart/chart/LineChart05.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2011-2013 Xeiam LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.xeiam.xchart.chart;
-
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.SwingWrapper;
-
-/**
- * Vertical and horizontal lines
- *
- * @author timmolter
- */
-public class LineChart05 {
-
- public static void main(String[] args) {
-
- // Create Chart
- Chart chart = new Chart(800, 600);
-
- // Customize Chart
- chart.setChartTitle("LineChart05");
- chart.setXAxisTitle("X");
- chart.setYAxisTitle("Y");
-
- chart.addSeries("vertical", new double[] { 1, 1 }, new double[] { -10, 10 });
- chart.addSeries("horizontal", new double[] { -10, 10 }, new double[] { 0, 0 });
- new SwingWrapper(chart).displayChart();
- }
-
-}
diff --git a/xchart/src/test/java/com/xeiam/xchart/chart/LineChart06.java b/xchart/src/test/java/com/xeiam/xchart/chart/LineChart06.java
deleted file mode 100644
index d673f1a1..00000000
--- a/xchart/src/test/java/com/xeiam/xchart/chart/LineChart06.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Copyright 2011-2013 Xeiam LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.xeiam.xchart.chart;
-
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.SwingWrapper;
-
-/**
- * Single point
- *
- * @author timmolter
- */
-public class LineChart06 {
-
- public static void main(String[] args) {
-
- // Create Chart
- Chart chart = new Chart(800, 600);
-
- // Customize Chart
- chart.setChartTitle("LineChart06");
- chart.setXAxisTitle("X");
- chart.setYAxisTitle("Y");
-
- chart.addSeries("single point (1,1)", new double[] { 1 }, new double[] { 1 });
-
- new SwingWrapper(chart).displayChart();
- }
-
-}
--
GitLab