Skip to content

Commit dd50c42

Browse files
committed
fix: getAxisLabel has viewPortHandler as parameter for user to use
1 parent 7deb707 commit dd50c42

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

Diff for: src/charting/formatter/IAxisValueFormatter.ts

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { AxisBase } from '../components/AxisBase';
2+
import { ViewPortHandler } from '../utils/ViewPortHandler';
23

34
/**
45
* Created by Philipp Jahoda on 20/09/15.
@@ -9,15 +10,16 @@ import { AxisBase } from '../components/AxisBase';
910
*/
1011
export interface IAxisValueFormatter {
1112
/**
12-
* Called when a value from an axis is to be formatted
13-
* before being drawn. For performance reasons, avoid excessive calculations
14-
* and memory allocations inside this method.
15-
*
16-
* @param value the value to be formatted
17-
* @param axis the axis the value belongs to
18-
* @return
19-
*
20-
* Extend {@link ValueFormatter} and use {@link ValueFormatter#getAxisLabel(float, AxisBase)}
21-
*/
22-
getAxisLabel(value, axis: AxisBase): string;
13+
* Called when a value from an axis is to be formatted
14+
* before being drawn. For performance reasons, avoid excessive calculations
15+
* and memory allocations inside this method.
16+
*
17+
* @param value the value to be formatted
18+
* @param axis the axis the value belongs to
19+
* @param viewPortHandler the viewPortHandler
20+
* @return
21+
*
22+
* Extend {@link ValueFormatter} and use {@link ValueFormatter#getAxisLabel(float, AxisBase)}
23+
*/
24+
getAxisLabel(value, axis: AxisBase, viewPortHandler: ViewPortHandler): string;
2325
}

Diff for: src/charting/renderer/AxisRenderer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ export abstract class AxisRenderer extends Renderer {
209209

210210
for (let i = 0; i < labelCount; i++) {
211211
axis.mEntries[i] = v;
212-
axis.mLabels[i] = formatter.getAxisLabel(v, axis);
212+
axis.mLabels[i] = formatter.getAxisLabel(v, axis, this.mViewPortHandler);
213213
v += interval;
214214
}
215215
n = labelCount;
@@ -258,7 +258,7 @@ export abstract class AxisRenderer extends Renderer {
258258
}
259259

260260
axis.mEntries[i] = f;
261-
axis.mLabels[i] = formatter.getAxisLabel(f, axis);
261+
axis.mLabels[i] = formatter.getAxisLabel(f, axis, this.mViewPortHandler);
262262
}
263263
}
264264

Diff for: src/charting/renderer/YAxisRendererRadarChart.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ export class YAxisRendererRadarChart extends YAxisRenderer {
6666

6767
for (let i = 0; i < labelCount; i++) {
6868
axis.mEntries[i] = v;
69-
axis.mLabels[i] = formatter.getAxisLabel(v, axis);
69+
axis.mLabels[i] = formatter.getAxisLabel(v, axis, this.mViewPortHandler);
7070
v += step;
7171
}
7272

@@ -107,7 +107,7 @@ export class YAxisRendererRadarChart extends YAxisRenderer {
107107
}
108108

109109
axis.mEntries[i] = f;
110-
axis.mLabels[i] = formatter.getAxisLabel(f, axis);
110+
axis.mLabels[i] = formatter.getAxisLabel(f, axis, this.mViewPortHandler);
111111
}
112112
}
113113

0 commit comments

Comments
 (0)