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 854cc5580cfa924a693b4c71b82914eff6597508..3a4fff4761ee8fc87460e538ac13b8a7bf3b3c68 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
@@ -17,9 +17,9 @@ package com.xeiam.xchart.demo.charts.area;
import com.xeiam.xchart.Chart;
import com.xeiam.xchart.ChartBuilder;
-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;
/**
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart04.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart04.java
index 6040e454a91010d4177a3f43fb1fb26575f90cb1..90f6478440c71280ae1989154d77bbb82b320f43 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart04.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart04.java
@@ -55,8 +55,8 @@ public class BarChart04 implements ExampleChart {
chart.addSeries("male", new double[] { 10, 20, 30, 50 }, new double[] { 40, 30, 20, 60 });
chart.addSeries("female", new double[] { 10, 20, 30, 40, 50 }, new double[] { 50, 10, 20, 40, 35 });
- chart.getStyleManager().setyAxisMin(5);
- chart.getStyleManager().setyAxisMax(70);
+ chart.getStyleManager().setYAxisMin(5);
+ chart.getStyleManager().setYAxisMax(70);
return chart;
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/Chart.java b/xchart/src/main/java/com/xeiam/xchart/Chart.java
index a2884272560c190a941e7c88624bdaa0d84c8318..953223925d0a93fb02c66d416582f3b9b25e3c89 100644
--- a/xchart/src/main/java/com/xeiam/xchart/Chart.java
+++ b/xchart/src/main/java/com/xeiam/xchart/Chart.java
@@ -219,9 +219,9 @@ public class Chart {
public void setYAxisTitle(String title) {
if (title == null || title.trim().equalsIgnoreCase("")) {
- chartPainter.getStyleManager().setyAxisTitleVisible(false);
+ chartPainter.getStyleManager().setYAxisTitleVisible(false);
} else {
- chartPainter.getStyleManager().setyAxisTitleVisible(true);
+ chartPainter.getStyleManager().setYAxisTitleVisible(true);
}
chartPainter.getAxisPair().getyAxis().getAxisTitle().setText(title);
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java b/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
index 51eef94d5107a9d3ab0a7888ca1301dafb7679a9..12c53692674bc9a94b8e74c7fdac06205df92431 100644
--- a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
+++ b/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
@@ -455,12 +455,12 @@ public class StyleManager {
*
* @param isVisible
*/
- public void setxAxisTitleVisible(boolean xAxisTitleVisible) {
+ public void setXAxisTitleVisible(boolean xAxisTitleVisible) {
this.xAxisTitleVisible = xAxisTitleVisible;
}
- public boolean isxAxisTitleVisible() {
+ public boolean isXAxisTitleVisible() {
return xAxisTitleVisible;
}
@@ -470,12 +470,12 @@ public class StyleManager {
*
* @param isVisible
*/
- public void setyAxisTitleVisible(boolean yAxisTitleVisible) {
+ public void setYAxisTitleVisible(boolean yAxisTitleVisible) {
this.yAxisTitleVisible = yAxisTitleVisible;
}
- public boolean isyAxisTitleVisible() {
+ public boolean isYAxisTitleVisible() {
return yAxisTitleVisible;
}
@@ -513,12 +513,12 @@ public class StyleManager {
* @param isVisible
*/
- public void setxAxisTicksVisible(boolean xAxisTicksVisible) {
+ public void setXAxisTicksVisible(boolean xAxisTicksVisible) {
this.xAxisTicksVisible = xAxisTicksVisible;
}
- public boolean isxAxisTicksVisible() {
+ public boolean isXAxisTicksVisible() {
return xAxisTicksVisible;
}
@@ -529,12 +529,12 @@ public class StyleManager {
* @param isVisible
*/
- public void setyAxisTicksVisible(boolean yAxisTicksVisible) {
+ public void setYAxisTicksVisible(boolean yAxisTicksVisible) {
this.yAxisTicksVisible = yAxisTicksVisible;
}
- public boolean isyAxisTicksVisible() {
+ public boolean isYAxisTicksVisible() {
return yAxisTicksVisible;
}
@@ -716,7 +716,7 @@ public class StyleManager {
return isYAxisLogarithmic;
}
- public void setxAxisMin(double xAxisMin) {
+ public void setXAxisMin(double xAxisMin) {
this.xAxisMin = xAxisMin;
}
@@ -726,7 +726,7 @@ public class StyleManager {
return xAxisMin;
}
- public void setxAxisMax(double xAxisMax) {
+ public void setXAxisMax(double xAxisMax) {
this.xAxisMax = xAxisMax;
}
@@ -736,22 +736,22 @@ public class StyleManager {
return xAxisMax;
}
- public void setyAxisMin(double yAxisMin) {
+ public void setYAxisMin(double yAxisMin) {
this.yAxisMin = yAxisMin;
}
- public Double getyAxisMin() {
+ public Double getYAxisMin() {
return yAxisMin;
}
- public void setyAxisMax(double yAxisMax) {
+ public void setYAxisMax(double yAxisMax) {
this.yAxisMax = yAxisMax;
}
- public Double getyAxisMax() {
+ public Double getYAxisMax() {
return yAxisMax;
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
index af8608deffcb54e844ad9b28cd58861782c2d536..cc033ca1a6d3103f0f66b725ae0e9749329ff283 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
@@ -80,8 +80,8 @@ public class Axis implements ChartPart {
this.axisPair = axisPair;
this.direction = direction;
- axisTitle = new AxisTitle(this, direction == Direction.X ? getChartPainter().getStyleManager().isxAxisTitleVisible() : getChartPainter().getStyleManager().isyAxisTitleVisible());
- axisTick = new AxisTick(this, direction == Direction.X ? getChartPainter().getStyleManager().isxAxisTicksVisible() : getChartPainter().getStyleManager().isyAxisTicksVisible());
+ axisTitle = new AxisTitle(this, direction == Direction.X ? getChartPainter().getStyleManager().isXAxisTitleVisible() : getChartPainter().getStyleManager().isYAxisTitleVisible());
+ axisTick = new AxisTick(this, direction == Direction.X ? getChartPainter().getStyleManager().isXAxisTicksVisible() : getChartPainter().getStyleManager().isYAxisTicksVisible());
}
/**
@@ -126,7 +126,7 @@ public class Axis implements ChartPart {
// Axis title
double titleHeight = 0.0;
- if (getChartPainter().getStyleManager().isxAxisTitleVisible()) {
+ if (axisTitle.getText() != null && !axisTitle.getText().trim().equalsIgnoreCase("") && getChartPainter().getStyleManager().isXAxisTitleVisible()) {
TextLayout textLayout = new TextLayout(axisTitle.getText(), getChartPainter().getStyleManager().getAxisTitleFont(), new FontRenderContext(null, true, false));
Rectangle rectangle = textLayout.getPixelBounds(null, 0, 0);
titleHeight = rectangle.getHeight() + getChartPainter().getStyleManager().getAxisTitlePadding();
@@ -134,7 +134,7 @@ public class Axis implements ChartPart {
// Axis tick labels
double axisTickLabelsHeight = 0.0;
- if (getChartPainter().getStyleManager().isxAxisTicksVisible()) {
+ if (getChartPainter().getStyleManager().isXAxisTicksVisible()) {
TextLayout textLayout = new TextLayout("0", getChartPainter().getStyleManager().getAxisTickLabelsFont(), new FontRenderContext(null, true, false));
Rectangle rectangle = textLayout.getPixelBounds(null, 0, 0);
axisTickLabelsHeight = rectangle.getHeight() + getChartPainter().getStyleManager().getAxisTickPadding() + getChartPainter().getStyleManager().getAxisTickMarkLength()
@@ -177,7 +177,7 @@ public class Axis implements ChartPart {
xOffset = (int) paintZone.getX();
yOffset = (int) paintZone.getY();
- width = (int) (getChartPainter().getStyleManager().isyAxisTitleVisible() ? axisTitle.getBounds().getWidth() : 0) + (int) axisTick.getBounds().getWidth();
+ width = (int) (getChartPainter().getStyleManager().isYAxisTitleVisible() ? axisTitle.getBounds().getWidth() : 0) + (int) axisTick.getBounds().getWidth();
height = (int) paintZone.getHeight();
bounds = new Rectangle(xOffset, yOffset, width, height);
// g.setColor(Color.yellow);
@@ -188,7 +188,7 @@ public class Axis implements ChartPart {
// calculate paint zone
// |____________________|
- int xOffset = (int) (axisPair.getyAxis().getBounds().getWidth() + (getChartPainter().getStyleManager().isyAxisTicksVisible() ? getChartPainter().getStyleManager().getPlotPadding() : 0) + getChartPainter()
+ int xOffset = (int) (axisPair.getyAxis().getBounds().getWidth() + (getChartPainter().getStyleManager().isYAxisTicksVisible() ? getChartPainter().getStyleManager().getPlotPadding() : 0) + getChartPainter()
.getStyleManager().getChartPadding());
int yOffset = (int) (axisPair.getyAxis().getBounds().getY() + axisPair.getyAxis().getBounds().getHeight());
@@ -211,7 +211,7 @@ public class Axis implements ChartPart {
xOffset = (int) paintZone.getX();
yOffset = (int) paintZone.getY();
width = (int) paintZone.getWidth();
- height = (int) ((getChartPainter().getStyleManager().isxAxisTitleVisible() ? axisTitle.getBounds().getHeight() : 0) + (int) axisTick.getBounds().getHeight());
+ height = (int) ((getChartPainter().getStyleManager().isXAxisTitleVisible() ? axisTitle.getBounds().getHeight() : 0) + (int) axisTick.getBounds().getHeight());
bounds = new Rectangle(xOffset, yOffset, width, height);
bounds = new Rectangle(xOffset, yOffset, width, height);
// g.setColor(Color.yellow);
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java
index 4b19ff49057be419d5b06fc9379f5c914a74ae84..d514f35bb927f626787828d8a8dfddabd1f73ec7 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java
@@ -82,14 +82,14 @@ public abstract class AxisTickCalculator {
if (axisDirection == Direction.X && styleManager.getxAxisMin() != null) {
overrideMinValue = new BigDecimal(styleManager.getxAxisMin());
}
- if (axisDirection == Direction.Y && styleManager.getyAxisMin() != null) {
- overrideMinValue = new BigDecimal(styleManager.getyAxisMin());
+ if (axisDirection == Direction.Y && styleManager.getYAxisMin() != null) {
+ overrideMinValue = new BigDecimal(styleManager.getYAxisMin());
}
if (axisDirection == Direction.X && styleManager.getxAxisMax() != null) {
overrideMaxValue = new BigDecimal(styleManager.getxAxisMax());
}
- if (axisDirection == Direction.Y && styleManager.getyAxisMax() != null) {
- overrideMaxValue = new BigDecimal(styleManager.getyAxisMax());
+ if (axisDirection == Direction.Y && styleManager.getYAxisMax() != null) {
+ overrideMaxValue = new BigDecimal(styleManager.getYAxisMax());
}
this.axisDirection = axisDirection;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java
index 7e5cf2de27bf7fef02c5c5307dac5c090e6929df..baa42fea655fc78888cd1ababbe6ca55a77e02f8 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java
@@ -60,7 +60,7 @@ public class AxisTitle implements ChartPart {
g.setFont(getChartPainter().getStyleManager().getAxisTitleFont());
if (axis.getDirection() == Axis.Direction.Y) {
- if (getChartPainter().getStyleManager().isyAxisTitleVisible()) {
+ if (text != null && !text.trim().equalsIgnoreCase("") && getChartPainter().getStyleManager().isYAxisTitleVisible()) {
FontRenderContext frc = g.getFontRenderContext();
TextLayout nonRotatedTextLayout = new TextLayout(text, getChartPainter().getStyleManager().getAxisTitleFont(), frc);
@@ -101,7 +101,7 @@ public class AxisTitle implements ChartPart {
} else {
- if (getChartPainter().getStyleManager().isxAxisTitleVisible()) {
+ if (text != null && !text.trim().equalsIgnoreCase("") && getChartPainter().getStyleManager().isXAxisTitleVisible()) {
FontRenderContext frc = g.getFontRenderContext();
TextLayout textLayout = new TextLayout(text, getChartPainter().getStyleManager().getAxisTitleFont(), frc);
@@ -142,11 +142,6 @@ public class AxisTitle implements ChartPart {
public void setText(String text) {
- if (text == null || text.trim().equalsIgnoreCase("")) {
- getChartPainter().getStyleManager().setxAxisTitleVisible(false);
- } else {
- getChartPainter().getStyleManager().setxAxisTitleVisible(true);
- }
this.text = text;
}
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
index 986538ff87ec61370967e61e3cdd4de14d74bb77..da909005f9292a134ad8efcfa971cd0ef6e03cf8 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
@@ -60,7 +60,7 @@ public class Plot implements ChartPart {
// calculate bounds
int xOffset = (int) (chartPainter.getAxisPair().getyAxis().getBounds().getX() + chartPainter.getAxisPair().getyAxis().getBounds().getWidth() + (chartPainter.getStyleManager()
- .isyAxisTicksVisible() ? (chartPainter.getStyleManager().getPlotPadding() + 1) : 0));
+ .isYAxisTicksVisible() ? (chartPainter.getStyleManager().getPlotPadding() + 1) : 0));
int yOffset = (int) (chartPainter.getAxisPair().getyAxis().getBounds().getY());
int width = (int) chartPainter.getAxisPair().getxAxis().getBounds().getWidth();
int height = (int) chartPainter.getAxisPair().getyAxis().getBounds().getHeight();
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
index c600f13f0063e542bca4e69260e654fee3792fb9..922997b19c0dcbeb951b3d23a64e47af5b86e114 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
@@ -86,11 +86,11 @@ public class PlotContentBarChart extends PlotContent {
yMax = BigDecimal.ZERO;
}
// override min and maxValue if specified
- if (getChartPainter().getStyleManager().getyAxisMin() != null) {
- yMin = new BigDecimal(getChartPainter().getStyleManager().getyAxisMin());
+ if (getChartPainter().getStyleManager().getYAxisMin() != null) {
+ yMin = new BigDecimal(getChartPainter().getStyleManager().getYAxisMin());
}
- if (getChartPainter().getStyleManager().getyAxisMax() != null) {
- yMax = new BigDecimal(getChartPainter().getStyleManager().getyAxisMax());
+ if (getChartPainter().getStyleManager().getYAxisMax() != null) {
+ yMax = new BigDecimal(getChartPainter().getStyleManager().getYAxisMax());
}
Iterator<?> categoryItr = categories.iterator();
Iterator<Number> yItr = yData.iterator();
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java
index 3db20db8cdec47183f4f0d81e47660bdc182ea32..3bc22faab07a2cc3591f23afae1e85bef3e1e64b 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java
@@ -80,14 +80,14 @@ public class PlotContentLineChart extends PlotContent {
if (getChartPainter().getStyleManager().getxAxisMin() != null) {
xMin = new BigDecimal(getChartPainter().getStyleManager().getxAxisMin());
}
- if (getChartPainter().getStyleManager().getyAxisMin() != null) {
- yMin = new BigDecimal(getChartPainter().getStyleManager().getyAxisMin());
+ if (getChartPainter().getStyleManager().getYAxisMin() != null) {
+ yMin = new BigDecimal(getChartPainter().getStyleManager().getYAxisMin());
}
if (getChartPainter().getStyleManager().getxAxisMax() != null) {
xMin = new BigDecimal(getChartPainter().getStyleManager().getxAxisMax());
}
- if (getChartPainter().getStyleManager().getyAxisMax() != null) {
- yMax = new BigDecimal(getChartPainter().getStyleManager().getyAxisMax());
+ if (getChartPainter().getStyleManager().getYAxisMax() != null) {
+ yMax = new BigDecimal(getChartPainter().getStyleManager().getYAxisMax());
}
Collection<Number> errorBars = series.getErrorBars();
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java b/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java
index 59507e7299b2c9b71ed68c37cc5373a4278931d8..ead2c0ad3556771452a82bafba8f9c902af4c237 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java
@@ -129,13 +129,13 @@ public class GGPlot2Theme implements Theme {
@Override
public boolean isXAxisTitleVisible() {
- return false;
+ return true;
}
@Override
public boolean isYAxisTitleVisible() {
- return false;
+ return true;
}
@Override
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java b/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java
index 10a85a76edfbca0ef58296f90efee95f0037f200..d660fdf266e2d8341703426a16bc4fc830d35e4c 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java
@@ -130,13 +130,13 @@ public class XChartTheme implements Theme {
@Override
public boolean isXAxisTitleVisible() {
- return false;
+ return true;
}
@Override
public boolean isYAxisTitleVisible() {
- return false;
+ return true;
}
@Override
diff --git a/xchart/src/test/java/com/xeiam/xchart/chart/Example2.java b/xchart/src/test/java/com/xeiam/xchart/chart/Example2.java
index c5eef837bc0e9e1d335ebd6fda2ebe4334252e5e..07258eae89f07001c34145ec69590b5b74625f75 100644
--- a/xchart/src/test/java/com/xeiam/xchart/chart/Example2.java
+++ b/xchart/src/test/java/com/xeiam/xchart/chart/Example2.java
@@ -39,8 +39,8 @@ public class Example2 {
for (int i = 0; i < numCharts; i++) {
Chart chart = new ChartBuilder().xAxisTitle("X").yAxisTitle("Y").width(600).height(400).build();
- chart.getStyleManager().setyAxisMin(-10);
- chart.getStyleManager().setyAxisMax(10);
+ chart.getStyleManager().setYAxisMin(-10);
+ chart.getStyleManager().setYAxisMax(10);
Series series = chart.addSeries("" + i, null, getRandomWalk(200));
series.setMarker(SeriesMarker.NONE);
charts.add(chart);