Skip to content
Snippets Groups Projects
Commit 19e2c97f authored by timmolter's avatar timmolter
Browse files

Merge branch 'master' into develop

Conflicts:
	README.md
	pom.xml
parents ca871f9c a7b0c4f5
Branches
No related tags found
No related merge requests found
...@@ -140,9 +140,22 @@ public class Chart { ...@@ -140,9 +140,22 @@ public class Chart {
* @param yData double[] * @param yData double[]
* @return * @return
*/ */
@Deprecated
public Series addSeries(String seriesName, double[] xData, double[] yData) { public Series addSeries(String seriesName, double[] xData, double[] yData) {
return addSeries(seriesName, xData, yData, null);
}
/**
* Convenience Method - Add series data as double arrays with errorbars
*
* @param seriesName
* @param xData
* @param yData
* @param errorBars
* @return
*/
public Series addSeries(String seriesName, double[] xData, double[] yData, double[] errorBars) {
Collection<Number> xDataNumber = null; Collection<Number> xDataNumber = null;
if (xData != null) { if (xData != null) {
xDataNumber = new ArrayList<Number>(); xDataNumber = new ArrayList<Number>();
...@@ -154,8 +167,15 @@ public class Chart { ...@@ -154,8 +167,15 @@ public class Chart {
for (double d : yData) { for (double d : yData) {
yDataNumber.add(new Double(d)); yDataNumber.add(new Double(d));
} }
Collection<Number> errorBarDataNumber = null;
if (errorBars != null) {
errorBarDataNumber = new ArrayList<Number>();
for (double d : errorBars) {
errorBarDataNumber.add(new Double(d));
}
}
return axisPair.addSeries(seriesName, xDataNumber, yDataNumber, null); return axisPair.addSeries(seriesName, xDataNumber, yDataNumber, errorBarDataNumber);
} }
public void setChartTitle(String title) { public void setChartTitle(String title) {
......
...@@ -46,7 +46,7 @@ public class Example8 { ...@@ -46,7 +46,7 @@ public class Example8 {
} }
// Create Chart // Create Chart
Chart chart = new Chart(440, 300); Chart chart = new Chart(600, 400);
// Customize Chart // Customize Chart
chart.setChartTitleVisible(false); chart.setChartTitleVisible(false);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment