From dd50c423176ce83009f7f21da04fc021851abde7 Mon Sep 17 00:00:00 2001 From: Martin Guillon Date: Wed, 14 Jul 2021 15:23:03 +0200 Subject: [PATCH] fix: getAxisLabel has viewPortHandler as parameter for user to use --- src/charting/formatter/IAxisValueFormatter.ts | 24 ++++++++++--------- src/charting/renderer/AxisRenderer.ts | 4 ++-- .../renderer/YAxisRendererRadarChart.ts | 4 ++-- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/src/charting/formatter/IAxisValueFormatter.ts b/src/charting/formatter/IAxisValueFormatter.ts index cb064ca3..4f24ba48 100644 --- a/src/charting/formatter/IAxisValueFormatter.ts +++ b/src/charting/formatter/IAxisValueFormatter.ts @@ -1,4 +1,5 @@ import { AxisBase } from '../components/AxisBase'; +import { ViewPortHandler } from '../utils/ViewPortHandler'; /** * Created by Philipp Jahoda on 20/09/15. @@ -9,15 +10,16 @@ import { AxisBase } from '../components/AxisBase'; */ export interface IAxisValueFormatter { /** - * Called when a value from an axis is to be formatted - * before being drawn. For performance reasons, avoid excessive calculations - * and memory allocations inside this method. - * - * @param value the value to be formatted - * @param axis the axis the value belongs to - * @return - * - * Extend {@link ValueFormatter} and use {@link ValueFormatter#getAxisLabel(float, AxisBase)} - */ - getAxisLabel(value, axis: AxisBase): string; + * Called when a value from an axis is to be formatted + * before being drawn. For performance reasons, avoid excessive calculations + * and memory allocations inside this method. + * + * @param value the value to be formatted + * @param axis the axis the value belongs to + * @param viewPortHandler the viewPortHandler + * @return + * + * Extend {@link ValueFormatter} and use {@link ValueFormatter#getAxisLabel(float, AxisBase)} + */ + getAxisLabel(value, axis: AxisBase, viewPortHandler: ViewPortHandler): string; } diff --git a/src/charting/renderer/AxisRenderer.ts b/src/charting/renderer/AxisRenderer.ts index 2623b2f0..915f2e55 100644 --- a/src/charting/renderer/AxisRenderer.ts +++ b/src/charting/renderer/AxisRenderer.ts @@ -209,7 +209,7 @@ export abstract class AxisRenderer extends Renderer { for (let i = 0; i < labelCount; i++) { axis.mEntries[i] = v; - axis.mLabels[i] = formatter.getAxisLabel(v, axis); + axis.mLabels[i] = formatter.getAxisLabel(v, axis, this.mViewPortHandler); v += interval; } n = labelCount; @@ -258,7 +258,7 @@ export abstract class AxisRenderer extends Renderer { } axis.mEntries[i] = f; - axis.mLabels[i] = formatter.getAxisLabel(f, axis); + axis.mLabels[i] = formatter.getAxisLabel(f, axis, this.mViewPortHandler); } } diff --git a/src/charting/renderer/YAxisRendererRadarChart.ts b/src/charting/renderer/YAxisRendererRadarChart.ts index a346725a..aea7222a 100644 --- a/src/charting/renderer/YAxisRendererRadarChart.ts +++ b/src/charting/renderer/YAxisRendererRadarChart.ts @@ -66,7 +66,7 @@ export class YAxisRendererRadarChart extends YAxisRenderer { for (let i = 0; i < labelCount; i++) { axis.mEntries[i] = v; - axis.mLabels[i] = formatter.getAxisLabel(v, axis); + axis.mLabels[i] = formatter.getAxisLabel(v, axis, this.mViewPortHandler); v += step; } @@ -107,7 +107,7 @@ export class YAxisRendererRadarChart extends YAxisRenderer { } axis.mEntries[i] = f; - axis.mLabels[i] = formatter.getAxisLabel(f, axis); + axis.mLabels[i] = formatter.getAxisLabel(f, axis, this.mViewPortHandler); } }