Skip to content

Fix XYChart area fill for negative values #327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2019
Merged

Fix XYChart area fill for negative values #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent_XY.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ public void doPaint(Graphics2D g) {
String[] toolTips = series.getToolTips();
boolean hasCustomToolTips = toolTips != null;

double yZeroTransform =
getBounds().getHeight() - (yTopMargin + (0 - yMin) / (yMax - yMin) * yTickSpace);
double yZeroOffset = yZeroTransform + getBounds().getY();

for (int i = 0; i < xData.length; i++) {

double x = xData[i];
Expand All @@ -91,7 +95,7 @@ public void doPaint(Graphics2D g) {
if (Double.isNaN(next)) {

// for area charts
closePath(g, path, previousX, getBounds(), yTopMargin);
closePathXY(g, path, previousX, yZeroOffset);
path = null;

previousX = -Double.MAX_VALUE;
Expand Down Expand Up @@ -170,12 +174,9 @@ public void doPaint(Graphics2D g) {
|| XYSeriesRenderStyle.StepArea == series.getXYSeriesRenderStyle()) {

if (previousX != -Double.MAX_VALUE && previousY != -Double.MAX_VALUE) {

double yBottomOfArea = getBounds().getY() + getBounds().getHeight() - yTopMargin;

if (path == null) {
path = new Path2D.Double();
path.moveTo(previousX, yBottomOfArea);
path.moveTo(previousX, yZeroOffset);
path.lineTo(previousX, previousY);
}
if (XYSeriesRenderStyle.Area == series.getXYSeriesRenderStyle()) {
Expand Down Expand Up @@ -271,7 +272,15 @@ public void doPaint(Graphics2D g) {

// close any open path for area charts
g.setColor(series.getFillColor());
closePath(g, path, previousX, getBounds(), yTopMargin);
closePathXY(g, path, previousX, yZeroOffset);
}
}

void closePathXY(Graphics2D g, Path2D.Double path, double previousX, double yZeroOffset) {
if (path != null) {
path.lineTo(previousX, yZeroOffset);
path.closePath();
g.fill(path);
}
}
}