File tree 7 files changed +9
-9
lines changed
7 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -85,7 +85,7 @@ export class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
85
85
}
86
86
87
87
public getCircleColor ( index ) {
88
- return this . circleColors [ Math . floor ( index ) ] || this . getColor ( ) ;
88
+ return this . circleColors [ Math . floor ( index ) ] || this . color ;
89
89
}
90
90
91
91
/**
@@ -132,7 +132,7 @@ export class LineDataSet extends LineRadarDataSet<Entry> implements ILineDataSet
132
132
}
133
133
134
134
mIgnoreFiltered = false ;
135
- protected get internalValues ( ) {
135
+ protected geInternalValues ( ) {
136
136
if ( this . mFilteredValues && ! this . mIgnoreFiltered ) {
137
137
return this . mFilteredValues ;
138
138
}
Original file line number Diff line number Diff line change @@ -162,7 +162,7 @@ export abstract class AxisRenderer extends Renderer {
162
162
const yMin = min ;
163
163
const yMax = max ;
164
164
165
- const labelCount = axis . labelCount ;
165
+ const labelCount = Math . max ( 0 , axis . labelCount ) ;
166
166
const range = Math . abs ( yMax - yMin ) ;
167
167
168
168
if ( labelCount === 0 || range <= 0 || ! Number . isFinite ( range ) ) {
Original file line number Diff line number Diff line change @@ -152,7 +152,7 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
152
152
renderPaint . setShader ( shader ) ;
153
153
}
154
154
if ( isSingleColor ) {
155
- renderPaint . setColor ( dataSet . getColor ( ) ) ;
155
+ renderPaint . setColor ( dataSet . color ) ;
156
156
}
157
157
158
158
const customRender = chart . customRenderer ;
Original file line number Diff line number Diff line change @@ -98,7 +98,7 @@ export class HorizontalBarChartRenderer extends BarChartRenderer {
98
98
}
99
99
100
100
if ( isSingleColor ) {
101
- renderPaint . setColor ( dataSet . getColor ( ) ) ;
101
+ renderPaint . setColor ( dataSet . color ) ;
102
102
}
103
103
104
104
const customRender = this . mChart . customRenderer ;
Original file line number Diff line number Diff line change @@ -238,7 +238,7 @@ export class LineChartRenderer extends LineRadarRenderer {
238
238
if ( dataSet . shader ) {
239
239
renderPaint . setShader ( dataSet . shader ) ;
240
240
}
241
- renderPaint . setColor ( dataSet . getColor ( ) ) ;
241
+ renderPaint . setColor ( dataSet . color ) ;
242
242
renderPaint . setStyle ( Style . STROKE ) ;
243
243
244
244
const scaleX = this . mViewPortHandler . getScaleX ( ) ;
@@ -487,7 +487,7 @@ export class LineChartRenderer extends LineRadarRenderer {
487
487
const color = colors [ index ] as { color : string | Color ; [ k : string ] : any } ;
488
488
let colorIndex = color [ xKey || 'index' ] as number ;
489
489
// if filtered we need to get the real index
490
- if ( ( dataSet as any ) . isFiltered ( ) ) {
490
+ if ( dataSet . filtered ) {
491
491
dataSet . ignoreFiltered = true ;
492
492
const entry = dataSet . getEntryForIndex ( colorIndex ) ;
493
493
dataSet . ignoreFiltered = false ;
Original file line number Diff line number Diff line change @@ -141,7 +141,7 @@ export class RadarChartRenderer extends LineRadarRenderer {
141
141
const lineWidth = dataSet . lineWidth ;
142
142
if ( ( ! dataSet . drawFilledEnabled || dataSet . fillAlpha < 255 ) && lineWidth > 0 ) {
143
143
const renderPaint = this . renderPaint ;
144
- renderPaint . setColor ( dataSet . getColor ( ) ) ;
144
+ renderPaint . setColor ( dataSet . color ) ;
145
145
renderPaint . setStrokeWidth ( lineWidth ) ;
146
146
renderPaint . setStyle ( Style . STROKE ) ;
147
147
c . drawPath ( surface , renderPaint ) ;
Original file line number Diff line number Diff line change @@ -19,7 +19,7 @@ export class YAxisRendererRadarChart extends YAxisRenderer {
19
19
const yMin = min ;
20
20
const yMax = max ;
21
21
22
- const labelCount = axis . labelCount ;
22
+ const labelCount = Math . max ( axis . labelCount , 0 ) ;
23
23
const range = Math . abs ( yMax - yMin ) ;
24
24
25
25
if ( labelCount === 0 || range <= 0 || ! Number . isFinite ( range ) ) {
You can’t perform that action at this time.
0 commit comments