Skip to content

Logarithmic axes scaling fix #163

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Logarithmic axes scaling fix #163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d791fd
NPE fix for Donut PiePlot in pointRenderers
Sep 21, 2017
cfaa2dd
Fix for break in scaling for some charts
nkaraman Oct 8, 2017
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
6 changes: 4 additions & 2 deletions gral-core/src/main/java/de/erichseifert/gral/plots/axes/LogarithmicRenderer2D.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@ public double worldToView(Axis axis, Number value, boolean extrapolate) {
}
double minLog = (min > 0.0) ? Math.log10(min) : 0.0;
double maxLog = (max > 0.0) ? Math.log10(max) : 1.0;
return (Math.log10(val) - minLog)*getShapeLength() /
double result = (Math.log10(val) - minLog)*getShapeLength() /
(maxLog - minLog);
return Double.isFinite(result) ? result : 0;
}

/**
Expand All @@ -92,8 +93,9 @@ public Number viewToWorld(Axis axis, double value, boolean extrapolate) {
}
double minLog = (min > 0.0) ? Math.log10(min) : 0.0;
double maxLog = (max > 0.0) ? Math.log10(max) : 1.0;
return Math.pow(10.0,
double result = Math.pow(10.0,
value*(maxLog - minLog)/getShapeLength() + minLog);
return Double.isFinite(result) ? result : 0;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion gral-core/src/test/java/de/erichseifert/gral/plots/axes/LogarithmicRenderer2DTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void testDraw() {

@Test
public void testWorldToView() {
assertEquals(Double.NEGATIVE_INFINITY, renderer.worldToView(axis, 0.0, true), DELTA);
assertEquals(0, renderer.worldToView(axis, 0.0, true), DELTA);
assertEquals(Math.log10( 0.1), renderer.worldToView(axis, 0.1, true), DELTA);
assertEquals(Math.log10( 1.0), renderer.worldToView(axis, 1.0, true), DELTA);
assertEquals(Math.log10( 5.0), renderer.worldToView(axis, 5.0, true), DELTA);
Expand Down