Skip to content
Snippets Groups Projects
Commit aacc526d authored by Hwaipy Li's avatar Hwaipy Li
Browse files

Merge branch 'develop' into Learning

parents 3bfa7529 b1d80c00
Branches
No related tags found
No related merge requests found
Showing
with 100 additions and 79 deletions
...@@ -24,11 +24,10 @@ log/ ...@@ -24,11 +24,10 @@ log/
*.bak *.bak
# Sample images # Sample images
*.png xchart-demo/*.png
*.jpg *.jpg
*.bmp *.bmp
*.gif *.gif
*.svg *.svg
*.pdf *.pdf
*.eps *.eps
...@@ -3,7 +3,7 @@ before_install: "git clone -b travis `git config --get remote.origin.url` target ...@@ -3,7 +3,7 @@ before_install: "git clone -b travis `git config --get remote.origin.url` target
script: " script: "
if [ ${TRAVIS_PULL_REQUEST} = 'false' ]; if [ ${TRAVIS_PULL_REQUEST} = 'false' ];
then then
mvn -Dmaven.test.skip=true clean deploy --settings target/travis/settings.xml; mvn clean deploy --settings target/travis/settings.xml;
else else
mvn clean verify --settings target/travis/settings.xml; mvn clean verify --settings target/travis/settings.xml;
fi" fi"
......
## [![XChart](http://xeiam.com/wp-content/uploads/xchartlogo.png)](http://xeiam.com/xchart) XChart ## [![XChart](https://raw.githubusercontent.com/timmolter/XChart/develop/etc/XChart_64_64.png)](http://xeiam.com/xchart) XChart
A Simple Charting Library for Java A Simple Charting Library for Java
## Description ## Description
...@@ -28,7 +28,7 @@ Usage is very simple: Create a Chart instance, add a series of data to it, and e ...@@ -28,7 +28,7 @@ Usage is very simple: Create a Chart instance, add a series of data to it, and e
Now go ahead and [study some more examples](http://xeiam.com/xchart-example-code/), [download the thing](http://xeiam.com/xchart-change-log) and [provide feedback](https://github.com/timmolter/XChart/issues). Now go ahead and [study some more examples](http://xeiam.com/xchart-example-code/), [download the thing](http://xeiam.com/xchart-change-log) and [provide feedback](https://github.com/timmolter/XChart/issues).
## Features ## Features
* No additional dependencies * No required additional dependencies
* ~100KB Jar * ~100KB Jar
* Line charts * Line charts
* Scatter charts * Scatter charts
...@@ -47,6 +47,7 @@ Now go ahead and [study some more examples](http://xeiam.com/xchart-example-code ...@@ -47,6 +47,7 @@ Now go ahead and [study some more examples](http://xeiam.com/xchart-example-code
* CSV import and export * CSV import and export
* High resolution chart export * High resolution chart export
* Real-time charts * Real-time charts
* [x] Java 6 and up
## Getting Started ## Getting Started
......
etc/XChart_64_64.png

2.86 KiB

Copyright 2011 - 2014 Xeiam LLC. Copyright 2011 - 2015 Xeiam LLC.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
......
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>com.xeiam.xchart</groupId> <groupId>com.xeiam.xchart</groupId>
...@@ -92,13 +93,78 @@ ...@@ -92,13 +93,78 @@
</dependency> </dependency>
</dependencies> </dependencies>
<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.6</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>doclint-java8-disable</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
<version>3.4</version>
<configuration>
<reportPlugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
</reportPlugins>
</configuration>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<build> <build>
<plugins> <plugins>
<!-- Ensure compilation is done under Java 6 in all environments --> <!-- Ensure compilation is done under Java 6 in all environments -->
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version> <version>3.2</version>
<configuration> <configuration>
<source>1.6</source> <source>1.6</source>
<target>1.6</target> <target>1.6</target>
...@@ -110,7 +176,7 @@ ...@@ -110,7 +176,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId> <artifactId>maven-source-plugin</artifactId>
<version>2.2.1</version> <version>2.4</version>
<executions> <executions>
<execution> <execution>
<id>attach-sources</id> <id>attach-sources</id>
...@@ -120,33 +186,14 @@ ...@@ -120,33 +186,14 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!-- Generates a Javadoc JAR during package -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
</execution>
</executions>
<configuration>
<excludePackageNames>com.xeiam.xchart.internal.*</excludePackageNames>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId> <artifactId>maven-release-plugin</artifactId>
<version>2.5</version> <version>2.5.1</version>
<configuration> <configuration>
<autoversionsubmodules>true</autoversionsubmodules> <autoversionsubmodules>true</autoversionsubmodules>
</configuration> </configuration>
</plugin> </plugin>
<!-- for header in all .java files --> <!-- for header in all .java files -->
<plugin> <plugin>
<groupId>com.mycila.maven-license-plugin</groupId> <groupId>com.mycila.maven-license-plugin</groupId>
...@@ -163,36 +210,6 @@ ...@@ -163,36 +210,6 @@
</plugins> </plugins>
</build> </build>
<profiles>
<profile>
<id>release-sign-artifacts</id>
<activation>
<property>
<name>performRelease</name>
<value>true</value>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>1.5</version>
<executions>
<execution>
<id>sign-artifacts</id>
<phase>verify</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
...@@ -49,6 +49,7 @@ import com.xeiam.xchart.demo.charts.date.DateChart04; ...@@ -49,6 +49,7 @@ import com.xeiam.xchart.demo.charts.date.DateChart04;
import com.xeiam.xchart.demo.charts.date.DateChart05; import com.xeiam.xchart.demo.charts.date.DateChart05;
import com.xeiam.xchart.demo.charts.date.DateChart06; import com.xeiam.xchart.demo.charts.date.DateChart06;
import com.xeiam.xchart.demo.charts.date.DateChart07; import com.xeiam.xchart.demo.charts.date.DateChart07;
import com.xeiam.xchart.demo.charts.date.DateChart08;
import com.xeiam.xchart.demo.charts.line.LineChart01; import com.xeiam.xchart.demo.charts.line.LineChart01;
import com.xeiam.xchart.demo.charts.line.LineChart02; import com.xeiam.xchart.demo.charts.line.LineChart02;
import com.xeiam.xchart.demo.charts.line.LineChart03; import com.xeiam.xchart.demo.charts.line.LineChart03;
...@@ -303,6 +304,9 @@ public class XChartDemo extends JPanel implements TreeSelectionListener { ...@@ -303,6 +304,9 @@ public class XChartDemo extends JPanel implements TreeSelectionListener {
defaultMutableTreeNode = new DefaultMutableTreeNode(new ChartInfo("DateChart07 - Year Scale", new DateChart07().getChart())); defaultMutableTreeNode = new DefaultMutableTreeNode(new ChartInfo("DateChart07 - Year Scale", new DateChart07().getChart()));
category.add(defaultMutableTreeNode); category.add(defaultMutableTreeNode);
defaultMutableTreeNode = new DefaultMutableTreeNode(new ChartInfo("DateChart08 - Rotated Labels", new DateChart08().getChart()));
category.add(defaultMutableTreeNode);
// Real-time category // Real-time category
category = new DefaultMutableTreeNode("Real-time Charts"); category = new DefaultMutableTreeNode("Real-time Charts");
top.add(category); top.add(category);
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
/** /**
* Copyright 2011 - 2014 Xeiam LLC. * Copyright 2011 - 2015 Xeiam LLC.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment