organicmaps/MPAndroidChart
13
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions

Minor fixes for interval in axis labels

Browse source
This commit is contained in:
Daniel Cohen Gindi 2016-09-29 08:59:33 +03:00 • committed by GitHub
parent 028328b986
commit aa14ab262b
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
MPChartLib/src/main/java/com/github/mikephil/charting/renderer/AxisRenderer.java
View file

@ -179,13 +179,12 @@ public abstract class AxisRenderer extends Renderer {
interval = Math.floor(10 * intervalMagnitude);
}
boolean centeringEnabled = mAxis.isCenterAxisLabelsEnabled();
int n = centeringEnabled ? 1 : 0;
// force label count
if (mAxis.isForceLabelsEnabled()) {
float step = (float) range / (float) (labelCount - 1);
interval = (float) range / (float) (labelCount - 1);
mAxis.mEntryCount = labelCount;
if (mAxis.mEntries.length < labelCount) {
@ -197,7 +196,7 @@ public abstract class AxisRenderer extends Renderer {
for (int i = 0; i < labelCount; i++) {
mAxis.mEntries[i] = v;
v += step;
v += interval;
}
n = labelCount;
@ -206,7 +205,7 @@ public abstract class AxisRenderer extends Renderer {
} else {
double first = interval == 0.0 ? 0.0 : Math.ceil(yMin / interval) * interval;
if(centeringEnabled) {
if(mAxis.isCenterAxisLabelsEnabled()) {
first -= interval;
}
@ -244,15 +243,13 @@ public abstract class AxisRenderer extends Renderer {
mAxis.mDecimals = 0;
}
if (centeringEnabled) {
if (mAxis.isCenterAxisLabelsEnabled()) {
if (mAxis.mCenteredEntries.length < n) {
mAxis.mCenteredEntries = new float[n];
}
float offset = 0.f;
if (mAxis.mEntries.length > 1)
offset = (mAxis.mEntries[1] - mAxis.mEntries[0]) / 2f;
float offset = (float)interval / 2f;
for (int i = 0; i < n; i++) {
mAxis.mCenteredEntries[i] = mAxis.mEntries[i] + offset;