Skip to content

Commit aebb8c2

Browse files
farfromrefugfarfromrefug
committed
fix: expose renderers
1 parent 1d2e264 commit aebb8c2

File tree

3 files changed

+42
-46
lines changed

3 files changed

+42
-46
lines changed

‎src/ui-chart/charts/BarLineChartBase.ts

+35-35
Original file line numberDiff line numberDiff line change
@@ -118,19 +118,19 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
118118
* axis renderer for the left axis.
119119
*
120120
*/
121-
rendererLeftYAxis: YAxisRenderer;
121+
leftAxisRenderer: YAxisRenderer;
122122

123123
/**
124124
* axis renderer for the right axis.
125125
*
126126
*/
127-
rendererRightYAxis: YAxisRenderer;
127+
rightAxisRenderer: YAxisRenderer;
128128

129129
/**
130130
* axis renderer for the x axis.
131131
*
132132
*/
133-
rendererXAxis: XAxisRenderer;
133+
xAxisRenderer: XAxisRenderer;
134134

135135
protected leftAxisTransformer: Transformer;
136136
protected rightAxisTransformer: Transformer;
@@ -145,9 +145,9 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
145145

146146
this.leftAxisTransformer = new Transformer(this.viewPortHandler);
147147

148-
this.rendererLeftYAxis = new YAxisRenderer(this.viewPortHandler, this.mAxisLeft, this.leftAxisTransformer);
148+
this.leftAxisRenderer = new YAxisRenderer(this.viewPortHandler, this.mAxisLeft, this.leftAxisTransformer);
149149

150-
this.rendererXAxis = new XAxisRenderer(this.viewPortHandler, this.xAxis, this.leftAxisTransformer);
150+
this.xAxisRenderer = new XAxisRenderer(this.viewPortHandler, this.xAxis, this.leftAxisTransformer);
151151

152152
this.highlighter = new ChartHighlighter(this);
153153
}
@@ -197,31 +197,31 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
197197
}
198198

199199
if (!noComputeAxisOnNextDraw) {
200-
this.rendererLeftYAxis?.computeAxis(axisLeft.axisMinimum, axisLeft.axisMaximum, axisLeft.inverted);
201-
this.rendererRightYAxis?.computeAxis(axisRight.axisMinimum, axisRight.axisMaximum, axisRight.inverted);
202-
this.rendererXAxis?.computeAxis(this.xAxis.axisMinimum, this.xAxis.axisMaximum, false);
200+
this.leftAxisRenderer?.computeAxis(axisLeft.axisMinimum, axisLeft.axisMaximum, axisLeft.inverted);
201+
this.rightAxisRenderer?.computeAxis(axisRight.axisMinimum, axisRight.axisMaximum, axisRight.inverted);
202+
this.xAxisRenderer?.computeAxis(this.xAxis.axisMinimum, this.xAxis.axisMaximum, false);
203203
}
204204

205205
if (!this.offsetsCalculated) {
206206
this.calculateOffsets(false);
207207
this.offsetsCalculated = true;
208208
}
209209

210-
if (xAxis.drawGridLinesBehindData) this.rendererXAxis.renderGridLines(canvas);
211-
if (axisLeft.drawGridLinesBehindData) this.rendererLeftYAxis.renderGridLines(canvas);
212-
if (axisRight?.drawGridLinesBehindData) this.rendererRightYAxis.renderGridLines(canvas);
210+
if (xAxis.drawGridLinesBehindData) this.xAxisRenderer.renderGridLines(canvas);
211+
if (axisLeft.drawGridLinesBehindData) this.leftAxisRenderer.renderGridLines(canvas);
212+
if (axisRight?.drawGridLinesBehindData) this.rightAxisRenderer.renderGridLines(canvas);
213213

214-
if (xAxis.drawLimitLinesBehindData) this.rendererXAxis.renderLimitLines(canvas);
215-
if (axisLeft.drawLimitLinesBehindData) this.rendererLeftYAxis.renderLimitLines(canvas);
216-
if (axisRight?.drawLimitLinesBehindData) this.rendererRightYAxis.renderLimitLines(canvas);
214+
if (xAxis.drawLimitLinesBehindData) this.xAxisRenderer.renderLimitLines(canvas);
215+
if (axisLeft.drawLimitLinesBehindData) this.leftAxisRenderer.renderLimitLines(canvas);
216+
if (axisRight?.drawLimitLinesBehindData) this.rightAxisRenderer.renderLimitLines(canvas);
217217

218-
this.rendererXAxis.renderAxisLine(canvas);
219-
this.rendererLeftYAxis.renderAxisLine(canvas);
220-
this.rendererRightYAxis?.renderAxisLine(canvas);
218+
this.xAxisRenderer.renderAxisLine(canvas);
219+
this.leftAxisRenderer.renderAxisLine(canvas);
220+
this.rightAxisRenderer?.renderAxisLine(canvas);
221221

222-
if (xAxis.drawLabelsBehindData) this.rendererXAxis.renderAxisLabels(canvas);
223-
if (axisLeft.drawLabelsBehindData) this.rendererLeftYAxis.renderAxisLabels(canvas);
224-
if (axisRight?.drawLabelsBehindData) this.rendererRightYAxis.renderAxisLabels(canvas);
222+
if (xAxis.drawLabelsBehindData) this.xAxisRenderer.renderAxisLabels(canvas);
223+
if (axisLeft.drawLabelsBehindData) this.leftAxisRenderer.renderAxisLabels(canvas);
224+
if (axisRight?.drawLabelsBehindData) this.rightAxisRenderer.renderAxisLabels(canvas);
225225

226226
// make sure the data cannot be drawn outside the content-rect
227227
if (this.clipDataToContent) {
@@ -232,9 +232,9 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
232232
this.renderer.drawData(canvas);
233233
}
234234

235-
if (!xAxis.drawGridLinesBehindData) this.rendererXAxis.renderGridLines(canvas);
236-
if (!axisLeft.drawGridLinesBehindData) this.rendererLeftYAxis.renderGridLines(canvas);
237-
if (axisRight?.drawGridLinesBehindData === false) this.rendererRightYAxis.renderGridLines(canvas);
235+
if (!xAxis.drawGridLinesBehindData) this.xAxisRenderer.renderGridLines(canvas);
236+
if (!axisLeft.drawGridLinesBehindData) this.leftAxisRenderer.renderGridLines(canvas);
237+
if (axisRight?.drawGridLinesBehindData === false) this.rightAxisRenderer.renderGridLines(canvas);
238238

239239
if (!this.clipHighlightToContent && this.clipDataToContent) {
240240
// restore before drawing highlight
@@ -251,13 +251,13 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
251251

252252
this.renderer.drawExtras(canvas);
253253

254-
if (!xAxis.drawLimitLinesBehindData) this.rendererXAxis.renderLimitLines(canvas);
255-
if (!axisLeft.drawLimitLinesBehindData) this.rendererLeftYAxis.renderLimitLines(canvas);
256-
if (axisRight?.drawLimitLinesBehindData === false) this.rendererRightYAxis.renderLimitLines(canvas);
254+
if (!xAxis.drawLimitLinesBehindData) this.xAxisRenderer.renderLimitLines(canvas);
255+
if (!axisLeft.drawLimitLinesBehindData) this.leftAxisRenderer.renderLimitLines(canvas);
256+
if (axisRight?.drawLimitLinesBehindData === false) this.rightAxisRenderer.renderLimitLines(canvas);
257257

258-
if (!xAxis.drawLabelsBehindData) this.rendererXAxis.renderAxisLabels(canvas);
259-
if (!axisLeft.drawLabelsBehindData) this.rendererLeftYAxis.renderAxisLabels(canvas);
260-
if (axisRight?.drawLabelsBehindData === false) this.rendererRightYAxis.renderAxisLabels(canvas);
258+
if (!xAxis.drawLabelsBehindData) this.xAxisRenderer.renderAxisLabels(canvas);
259+
if (!axisLeft.drawLabelsBehindData) this.leftAxisRenderer.renderAxisLabels(canvas);
260+
if (axisRight?.drawLabelsBehindData === false) this.rightAxisRenderer.renderAxisLabels(canvas);
261261

262262
if (this.clipValuesToContent) {
263263
canvas.save();
@@ -317,13 +317,13 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
317317
this.calcMinMax();
318318

319319
if (this.mAxisLeft?.enabled) {
320-
this.rendererLeftYAxis.computeAxis(this.mAxisLeft.axisMinimum, this.mAxisLeft.axisMaximum, this.mAxisLeft.inverted);
320+
this.leftAxisRenderer.computeAxis(this.mAxisLeft.axisMinimum, this.mAxisLeft.axisMaximum, this.mAxisLeft.inverted);
321321
}
322322
if (this.mAxisRight?.enabled) {
323-
this.rendererRightYAxis.computeAxis(this.mAxisRight.axisMinimum, this.mAxisRight.axisMaximum, this.mAxisRight.inverted);
323+
this.rightAxisRenderer.computeAxis(this.mAxisRight.axisMinimum, this.mAxisRight.axisMaximum, this.mAxisRight.inverted);
324324
}
325325
if (this.xAxis.enabled) {
326-
this.rendererXAxis.computeAxis(this.xAxis.axisMinimum, this.xAxis.axisMaximum, false);
326+
this.xAxisRenderer.computeAxis(this.xAxis.axisMinimum, this.xAxis.axisMaximum, false);
327327
}
328328

329329
if (this.mLegend?.enabled) {
@@ -438,11 +438,11 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
438438

439439
// offsets for y-labels
440440
if (this.mAxisLeft?.needsOffset) {
441-
offsetLeft += this.mAxisLeft.getRequiredWidthSpace(this.rendererLeftYAxis.axisLabelsPaint);
441+
offsetLeft += this.mAxisLeft.getRequiredWidthSpace(this.leftAxisRenderer.axisLabelsPaint);
442442
}
443443

444444
if (this.mAxisRight?.needsOffset) {
445-
offsetRight += this.mAxisRight.getRequiredWidthSpace(this.rendererRightYAxis.axisLabelsPaint);
445+
offsetRight += this.mAxisRight.getRequiredWidthSpace(this.rightAxisRenderer.axisLabelsPaint);
446446
}
447447

448448
if (this.xAxis.enabled && this.xAxis.drawLabels) {
@@ -1307,7 +1307,7 @@ export abstract class BarLineChartBase<U extends Entry, D extends IBarLineScatte
13071307
if (!this.mAxisRight) {
13081308
this.mAxisRight = new YAxis(AxisDependency.RIGHT, new WeakRef(this));
13091309
this.rightAxisTransformer = new Transformer(this.viewPortHandler);
1310-
this.rendererRightYAxis = new YAxisRenderer(this.viewPortHandler, this.mAxisRight, this.rightAxisTransformer);
1310+
this.rightAxisRenderer = new YAxisRenderer(this.viewPortHandler, this.mAxisRight, this.rightAxisTransformer);
13111311
}
13121312
return this.mAxisRight;
13131313
}

‎src/ui-chart/charts/HorizontalBarChart.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ export class HorizontalBarChart extends BarChart {
2929
this.renderer = new HorizontalBarChartRenderer(this, this.animator, this.viewPortHandler);
3030
this.highlighter = new HorizontalBarHighlighter(this);
3131

32-
this.rendererLeftYAxis = new YAxisRendererHorizontalBarChart(this.viewPortHandler, this.mAxisLeft, this.leftAxisTransformer);
32+
this.leftAxisRenderer = new YAxisRendererHorizontalBarChart(this.viewPortHandler, this.mAxisLeft, this.leftAxisTransformer);
3333
}
3434

3535
public get axisRight() {
3636
if (!this.mAxisRight) {
37-
this.rendererRightYAxis = new YAxisRendererHorizontalBarChart(this.viewPortHandler, this.mAxisRight, this.rightAxisTransformer);
38-
this.rendererXAxis = new XAxisRendererHorizontalBarChart(this.viewPortHandler, this.xAxis, this.leftAxisTransformer, this);
37+
this.rightAxisRenderer = new YAxisRendererHorizontalBarChart(this.viewPortHandler, this.mAxisRight, this.rightAxisTransformer);
38+
this.xAxisRenderer = new XAxisRendererHorizontalBarChart(this.viewPortHandler, this.xAxis, this.leftAxisTransformer, this);
3939
this.rightAxisTransformer = new TransformerHorizontalBarChart(this.viewPortHandler);
4040
}
4141
return this.mAxisRight;
@@ -52,11 +52,11 @@ export class HorizontalBarChart extends BarChart {
5252

5353
// offsets for y-labels
5454
if (this.mAxisLeft?.needsOffset) {
55-
offsetTop += this.mAxisLeft.getRequiredHeightSpace(this.rendererLeftYAxis.axisLabelsPaint);
55+
offsetTop += this.mAxisLeft.getRequiredHeightSpace(this.leftAxisRenderer.axisLabelsPaint);
5656
}
5757

5858
if (this.mAxisRight?.needsOffset) {
59-
offsetBottom += this.mAxisRight.getRequiredHeightSpace(this.rendererRightYAxis.axisLabelsPaint);
59+
offsetBottom += this.mAxisRight.getRequiredHeightSpace(this.rightAxisRenderer.axisLabelsPaint);
6060
}
6161

6262
const xlabelWidth = this.xAxis.mLabelRotatedWidth;

‎src/ui-chart/charts/RadarChart.ts

+2-6
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,8 @@ export class RadarChart extends PieRadarChartBase<Entry, RadarDataSet, RadarData
6666
*/
6767
yAxis: YAxis;
6868

69-
// for performance tracking
70-
private mTotalTime = 0;
71-
private mDrawCycles = 0;
72-
73-
protected yAxisRenderer: YAxisRendererRadarChart;
74-
protected xAxisRenderer: XAxisRendererRadarChart;
69+
public yAxisRenderer: YAxisRendererRadarChart;
70+
public xAxisRenderer: XAxisRendererRadarChart;
7571

7672
protected init() {
7773
super.init();

0 commit comments

Comments
 (0)