From 1283d19469ff98f51a95fbfc254396461793b101 Mon Sep 17 00:00:00 2001 From: Tim Molter <tim.molter@gmail.com> Date: Fri, 5 Apr 2013 11:57:53 +0200 Subject: [PATCH] fixed axis title visibility bug --- .../main/java/com/xeiam/xchart/standalone/ErrorBarTest.java | 1 - xchart/src/main/java/com/xeiam/xchart/Chart.java | 5 ----- xchart/src/main/java/com/xeiam/xchart/StyleManager.java | 1 - .../java/com/xeiam/xchart/internal/chartpart/AxisTitle.java | 1 + 4 files changed, 1 insertion(+), 7 deletions(-) diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java index 6d094d70..bbb4c9da 100644 --- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java +++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java @@ -45,7 +45,6 @@ public class ErrorBarTest { double[] yData3 = new double[] { 150, 120, 110, 100, 90, 70, 60 }; Chart mychart = new Chart(900, 700); - // mychart.getStyleManager().setYAxisLogarithmic(true); // set log or linear Y axis mychart.getStyleManager().setYAxisMin(0); mychart.getStyleManager().setYAxisMax(150); mychart.getStyleManager().setErrorBarsColor(Color.black); diff --git a/xchart/src/main/java/com/xeiam/xchart/Chart.java b/xchart/src/main/java/com/xeiam/xchart/Chart.java index 6fc33516..b855d624 100644 --- a/xchart/src/main/java/com/xeiam/xchart/Chart.java +++ b/xchart/src/main/java/com/xeiam/xchart/Chart.java @@ -219,11 +219,6 @@ public class Chart { */ public void setYAxisTitle(String title) { - if (title == null || title.trim().equalsIgnoreCase("")) { - chartPainter.getStyleManager().setYAxisTitleVisible(false); - } else { - 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 e4a763b9..ba7ba7bf 100644 --- a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java +++ b/xchart/src/main/java/com/xeiam/xchart/StyleManager.java @@ -515,7 +515,6 @@ public class StyleManager { this.xAxisTitleVisible = isVisible; this.yAxisTitleVisible = isVisible; - } /** 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 a9e393c4..abf855da 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,6 +60,7 @@ public class AxisTitle implements ChartPart { g.setFont(getChartPainter().getStyleManager().getAxisTitleFont()); if (axis.getDirection() == Axis.Direction.Y) { + if (text != null && !text.trim().equalsIgnoreCase("") && getChartPainter().getStyleManager().isYAxisTitleVisible()) { FontRenderContext frc = g.getFontRenderContext(); -- GitLab