Skip to content

Commit 8b6984c

Browse files
committed
fix: better render when axis force labels count is not round
1 parent 5060321 commit 8b6984c

File tree

2 files changed

+8
-9
lines changed

2 files changed

+8
-9
lines changed

src/charting/renderer/AxisRenderer.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -207,25 +207,25 @@ export abstract class AxisRenderer extends Renderer {
207207
// force label count
208208
if (axis.isForceLabelsEnabled()) {
209209
interval = range / (labelCount - 1);
210-
axis.mEntryCount = labelCount;
210+
axis.mEntryCount = Math.floor(labelCount);
211211

212-
if (axis.mEntries.length < labelCount) {
212+
if (axis.mEntries.length < axis.mEntryCount) {
213213
// Ensure stops contains at least numStops elements.
214214
axis.mEntries = [];
215215
axis.mLabels = [];
216216
}
217217

218218
let v = min;
219219

220-
for (let i = 0; i < labelCount; i++) {
221-
if (axis.ensureLastLabel && i === labelCount - 1) {
220+
for (let i = 0; i < axis.mEntryCount; i++) {
221+
if (axis.ensureLastLabel && i === axis.mEntryCount - 1) {
222222
v = max;
223223
}
224224
axis.mEntries[i] = v;
225225
axis.mLabels[i] = formatter.getAxisLabel(v, axis, this.mViewPortHandler);
226226
v += interval;
227227
}
228-
n = labelCount;
228+
n = axis.mEntryCount;
229229

230230
// no forced count
231231
} else {

src/charting/renderer/YAxisRendererRadarChart.ts

+3-4
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export class YAxisRendererRadarChart extends YAxisRenderer {
5454
// force label count
5555
if (axis.isForceLabelsEnabled()) {
5656
const step = range / (labelCount - 1);
57-
axis.mEntryCount = labelCount;
57+
axis.mEntryCount = Math.floor(labelCount);
5858

5959
// if (this.mAxis.mEntries.length < labelCount) {
6060
// // Ensure stops contains at least numStops elements.
@@ -64,13 +64,12 @@ export class YAxisRendererRadarChart extends YAxisRenderer {
6464

6565
let v = min;
6666

67-
for (let i = 0; i < labelCount; i++) {
67+
for (let i = 0; i < axis.mEntryCount; i++) {
6868
axis.mEntries[i] = v;
6969
axis.mLabels[i] = formatter.getAxisLabel(v, axis, this.mViewPortHandler);
7070
v += step;
7171
}
72-
73-
n = labelCount;
72+
n = axis.mEntryCount;
7473

7574
// no forced count
7675
} else {

0 commit comments

Comments
 (0)