From 8dc0dfae72389961a4e7850c6fccea39b133cb62 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim.molter@gmail.com>
Date: Sun, 12 Apr 2015 22:00:57 +0200
Subject: [PATCH] misc cleanup
---
.../com/xeiam/xchart/demo/charts/line/LineChart04.java | 1 +
xchart/src/main/java/com/xeiam/xchart/XChartPanel.java | 4 +++-
.../xchart/internal/chartpart/AxisTickLabels.java | 3 ++-
.../xeiam/xchart/internal/chartpart/AxisTickMarks.java | 10 +++++-----
.../xeiam/xchart/internal/chartpart/ChartPainter.java | 2 +-
.../internal/chartpart/PlotContentLineChart.java | 1 +
.../xeiam/xchart/internal/chartpart/PlotSurface.java | 8 +++++---
7 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart04.java b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart04.java
index 35796a32..9112824e 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart04.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart04.java
@@ -53,6 +53,7 @@ public class LineChart04 implements ExampleChart {
series.setLineStyle(SeriesLineStyle.SOLID);
series.setMarker(SeriesMarker.CIRCLE);
series.setMarkerColor(SeriesColor.BLUE);
+
}
return chart;
diff --git a/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java b/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
index d91fe2bc..6d2365e8 100644
--- a/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
+++ b/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
@@ -88,7 +88,9 @@ public class XChartPanel extends JPanel {
super.paintComponent(g);
- chart.paint((Graphics2D) g, getWidth(), getHeight());
+ Graphics2D g2d = (Graphics2D) g.create();
+ chart.paint(g2d, getWidth(), getHeight());
+ g2d.dispose();
}
@Override
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java
index d22f8635..ebd5b079 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java
@@ -122,7 +122,8 @@ public class AxisTickLabels implements ChartPart {
// g.draw(bounds);
}
- else if (axisTick.getAxis().getDirection() == Axis.Direction.X && getChartPainter().getStyleManager().isXAxisTicksVisible()) { // X-Axis
+ // X-Axis
+ else if (axisTick.getAxis().getDirection() == Axis.Direction.X && getChartPainter().getStyleManager().isXAxisTicksVisible()) {
double xOffset = axisTick.getAxis().getPaintZone().getX();
double yOffset = axisTick.getAxis().getAxisTitle().getBounds().getY();
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java
index d099a402..87f966dd 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java
@@ -89,7 +89,8 @@ public class AxisTickMarks implements ChartPart {
}
}
- else if (axisTick.getAxis().getDirection() == Axis.Direction.X && getChartPainter().getStyleManager().isXAxisTicksVisible()) { // X-Axis
+ // X-Axis
+ else if (axisTick.getAxis().getDirection() == Axis.Direction.X && getChartPainter().getStyleManager().isXAxisTicksVisible()) {
double xOffset = axisTick.getAxis().getPaintZone().getX();
double yOffset = axisTick.getAxisTickLabels().getBounds().getY() - getChartPainter().getStyleManager().getAxisTickPadding();
@@ -120,10 +121,9 @@ public class AxisTickMarks implements ChartPart {
// Line
if (getChartPainter().getStyleManager().isAxisTicksLineVisible()) {
- Shape line =
- new Line2D.Double(xOffset, yOffset - getChartPainter().getStyleManager().getAxisTickMarkLength(), xOffset + axisTick.getAxis().getPaintZone().getWidth(), yOffset
- - getChartPainter().getStyleManager().getAxisTickMarkLength());
- g.draw(line);
+ g.setStroke(getChartPainter().getStyleManager().getAxisTickMarksStroke());
+ g.drawLine((int) xOffset, (int) (yOffset - getChartPainter().getStyleManager().getAxisTickMarkLength()), (int) (xOffset + axisTick.getAxis().getPaintZone().getWidth()),
+ (int) (yOffset - getChartPainter().getStyleManager().getAxisTickMarkLength()));
}
}
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java
index 8242dbbf..48f08cc6 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java
@@ -109,7 +109,7 @@ public class ChartPainter {
axisPair.paint(g);
plot.paint(g);
- // TODO why not just paint them first and skip the size hinting?
+ // TODO why not just paint the title first and skip the size hinting?
chartTitle.paint(g);
chartLegend.paint(g);
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 ba015102..5f84e9e5 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
@@ -280,6 +280,7 @@ public class PlotContentLineChart extends PlotContent {
}
g.setClip(null);
+
}
/**
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java
index f0898e86..c146cf64 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java
+++ b/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java
@@ -62,6 +62,7 @@ public class PlotSurface implements ChartPart {
// paint plot border
if (getChartPainter().getStyleManager().isPlotBorderVisible()) {
g.setColor(getChartPainter().getStyleManager().getPlotBorderColor());
+ // g.setStroke(getChartPainter().getStyleManager().getAxisTickMarksStroke());
g.draw(rect);
}
@@ -84,6 +85,7 @@ public class PlotSurface implements ChartPart {
Shape line = new Line2D.Double(bounds.getX(), yOffset, bounds.getX() + bounds.getWidth(), yOffset);
g.draw(line);
}
+
// tick marks
if (getChartPainter().getStyleManager().isPlotTicksMarksVisible()) {
@@ -100,11 +102,11 @@ public class PlotSurface implements ChartPart {
// vertical
if (getChartPainter().getStyleManager().getChartType() != ChartType.Bar
- && (getChartPainter().getStyleManager().isPlotGridLinesVisible()
+ && (getChartPainter().getStyleManager().isPlotGridLinesVisible()
- || getChartPainter().getStyleManager().isPlotTicksMarksVisible())
+ || getChartPainter().getStyleManager().isPlotTicksMarksVisible())
- ) {
+ ) {
List<Double> xAxisTickLocations = getChartPainter().getAxisPair().getXAxis().getAxisTick().getTickLocations();
for (int i = 0; i < xAxisTickLocations.size(); i++) {
--
GitLab