Skip to content
Snippets Groups Projects
Commit 5ee97f63 authored by Tim Molter's avatar Tim Molter
Browse files

bugfix for issue #84 - The bar chart doesn't show the title in the version 2.4.1

parent 93c4ed8e
No related branches found
No related tags found
No related merge requests found
...@@ -94,8 +94,8 @@ public class ChartTitle implements ChartPart { ...@@ -94,8 +94,8 @@ public class ChartTitle implements ChartPart {
TextLayout textLayout = new TextLayout(text, chartPainter.getStyleManager().getChartTitleFont(), frc); TextLayout textLayout = new TextLayout(text, chartPainter.getStyleManager().getChartTitleFont(), frc);
Rectangle2D rectangle = textLayout.getBounds(); Rectangle2D rectangle = textLayout.getBounds();
int xOffset = (int) chartPainter.getPlot().getBounds().getX(); double xOffset = (int) chartPainter.getPlot().getBounds().getX();
int yOffset = chartPainter.getStyleManager().getChartPadding(); double yOffset = chartPainter.getStyleManager().getChartPadding();
if (chartPainter.getStyleManager().isChartTitleBoxVisible()) { if (chartPainter.getStyleManager().isChartTitleBoxVisible()) {
...@@ -109,12 +109,11 @@ public class ChartTitle implements ChartPart { ...@@ -109,12 +109,11 @@ public class ChartTitle implements ChartPart {
g.fill(rect); g.fill(rect);
g.setColor(chartPainter.getStyleManager().getChartTitleBoxBorderColor()); g.setColor(chartPainter.getStyleManager().getChartTitleBoxBorderColor());
g.draw(rect); g.draw(rect);
} }
// paint title // paint title
xOffset = (int) (chartPainter.getPlot().getBounds().getX() + (chartPainter.getPlot().getBounds().getWidth() - rectangle.getWidth()) / 2.0); xOffset = chartPainter.getPlot().getBounds().getX() + (chartPainter.getPlot().getBounds().getWidth() - rectangle.getWidth()) / 2.0;
yOffset = (int) (chartPainter.getStyleManager().getChartPadding() - rectangle.getY() + chartPainter.getStyleManager().getChartTitlePadding()); yOffset = chartPainter.getStyleManager().getChartPadding() - rectangle.getY() + chartPainter.getStyleManager().getChartTitlePadding();
bounds = new Rectangle2D.Double(xOffset, yOffset + rectangle.getY(), rectangle.getWidth(), rectangle.getHeight()); bounds = new Rectangle2D.Double(xOffset, yOffset + rectangle.getY(), rectangle.getWidth(), rectangle.getHeight());
// g.setColor(Color.green); // g.setColor(Color.green);
......
...@@ -44,7 +44,6 @@ public class Plot implements ChartPart { ...@@ -44,7 +44,6 @@ public class Plot implements ChartPart {
this.chartPainter = chartPainter; this.chartPainter = chartPainter;
this.plotSurface = new PlotSurface(this); this.plotSurface = new PlotSurface(this);
} }
@Override @Override
......
...@@ -45,10 +45,17 @@ public class PlotContentBarChart extends PlotContent { ...@@ -45,10 +45,17 @@ public class PlotContentBarChart extends PlotContent {
public void paint(Graphics2D g) { public void paint(Graphics2D g) {
Rectangle2D bounds = plot.getBounds(); Rectangle2D bounds = plot.getBounds();
// g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
// g.setColor(Color.red);
// g.draw(bounds);
StyleManager styleManager = plot.getChartPainter().getStyleManager(); StyleManager styleManager = plot.getChartPainter().getStyleManager();
// this is for preventing the series to be drawn outside the plot area if min and max is overridden to fall inside the data range // this is for preventing the series to be drawn outside the plot area if min and max is overridden to fall inside the data range
Rectangle rectangle = new Rectangle(0, 0, getChartPainter().getWidth(), getChartPainter().getHeight()); Rectangle rectangle = new Rectangle(0, 0, getChartPainter().getWidth(), getChartPainter().getHeight());
// g.setStroke(new BasicStroke(1, BasicStroke.CAP_BUTT, BasicStroke.JOIN_BEVEL));
// g.setColor(Color.green);
// g.draw(rectangle);
g.setClip(bounds.createIntersection(rectangle)); g.setClip(bounds.createIntersection(rectangle));
// X-Axis // X-Axis
...@@ -206,7 +213,7 @@ public class PlotContentBarChart extends PlotContent { ...@@ -206,7 +213,7 @@ public class PlotContentBarChart extends PlotContent {
} }
seriesCounter++; seriesCounter++;
} }
g.setClip(null);
} }
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment