Skip to content

Commit 0613dc3

Browse files
committed
fix: multiple regression fixes after big rewrite
1 parent b65b7f5 commit 0613dc3

7 files changed

+9
-9
lines changed

src/ui-chart/data/LineDataSet.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
8585
}
8686

8787
public getCircleColor(index) {
88-
return this.circleColors[Math.floor(index)] || this.getColor();
88+
return this.circleColors[Math.floor(index)] || this.color;
8989
}
9090

9191
/**
@@ -132,7 +132,7 @@ export class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
132132
}
133133

134134
mIgnoreFiltered = false;
135-
protected get internalValues() {
135+
protected geInternalValues() {
136136
if (this.mFilteredValues && !this.mIgnoreFiltered) {
137137
return this.mFilteredValues;
138138
}

src/ui-chart/renderer/AxisRenderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ export abstract class AxisRenderer extends Renderer {
162162
const yMin = min;
163163
const yMax = max;
164164

165-
const labelCount = axis.labelCount;
165+
const labelCount = Math.max(0, axis.labelCount);
166166
const range = Math.abs(yMax - yMin);
167167

168168
if (labelCount === 0 || range <= 0 || !Number.isFinite(range)) {

src/ui-chart/renderer/BarChartRenderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
152152
renderPaint.setShader(shader);
153153
}
154154
if (isSingleColor) {
155-
renderPaint.setColor(dataSet.getColor());
155+
renderPaint.setColor(dataSet.color);
156156
}
157157

158158
const customRender = chart.customRenderer;

src/ui-chart/renderer/HorizontalBarChartRenderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ export class HorizontalBarChartRenderer extends BarChartRenderer {
9898
}
9999

100100
if (isSingleColor) {
101-
renderPaint.setColor(dataSet.getColor());
101+
renderPaint.setColor(dataSet.color);
102102
}
103103

104104
const customRender = this.mChart.customRenderer;

src/ui-chart/renderer/LineChartRenderer.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ export class LineChartRenderer extends LineRadarRenderer {
238238
if (dataSet.shader) {
239239
renderPaint.setShader(dataSet.shader);
240240
}
241-
renderPaint.setColor(dataSet.getColor());
241+
renderPaint.setColor(dataSet.color);
242242
renderPaint.setStyle(Style.STROKE);
243243

244244
const scaleX = this.mViewPortHandler.getScaleX();
@@ -487,7 +487,7 @@ export class LineChartRenderer extends LineRadarRenderer {
487487
const color = colors[index] as { color: string | Color; [k: string]: any };
488488
let colorIndex = color[xKey || 'index'] as number;
489489
// if filtered we need to get the real index
490-
if ((dataSet as any).isFiltered()) {
490+
if (dataSet.filtered) {
491491
dataSet.ignoreFiltered = true;
492492
const entry = dataSet.getEntryForIndex(colorIndex);
493493
dataSet.ignoreFiltered = false;

src/ui-chart/renderer/RadarChartRenderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ export class RadarChartRenderer extends LineRadarRenderer {
141141
const lineWidth = dataSet.lineWidth;
142142
if ((!dataSet.drawFilledEnabled || dataSet.fillAlpha < 255) && lineWidth > 0) {
143143
const renderPaint = this.renderPaint;
144-
renderPaint.setColor(dataSet.getColor());
144+
renderPaint.setColor(dataSet.color);
145145
renderPaint.setStrokeWidth(lineWidth);
146146
renderPaint.setStyle(Style.STROKE);
147147
c.drawPath(surface, renderPaint);

src/ui-chart/renderer/YAxisRendererRadarChart.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class YAxisRendererRadarChart extends YAxisRenderer {
1919
const yMin = min;
2020
const yMax = max;
2121

22-
const labelCount = axis.labelCount;
22+
const labelCount = Math.max(axis.labelCount, 0);
2323
const range = Math.abs(yMax - yMin);
2424

2525
if (labelCount === 0 || range <= 0 || !Number.isFinite(range)) {

0 commit comments

Comments
 (0)