Skip to content

Commit b321e57

Browse files
farfromrefugfarfromrefug
committed
fix: icons not drawing
1 parent 10f97c1 commit b321e57

8 files changed

+171
-162
lines changed

‎src/charting/renderer/BarChartRenderer.ts

+8-5
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
180180
public drawValues(c: Canvas) {
181181
const data = this.mChart.getData();
182182
const dataSets = data.getDataSets();
183-
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled()) === false) {
183+
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled() || d.isDrawIconsEnabled()) === false) {
184184
return;
185185
}
186186
// if values are drawn
@@ -223,6 +223,9 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
223223
const iconsOffset = dataSet.getIconsOffset();
224224

225225
// if only single values are drawn (sum)
226+
227+
const isDrawValuesEnabled = dataSet.isDrawValuesEnabled();
228+
const isDrawIconsEnabled = dataSet.isDrawIconsEnabled();
226229
if (!dataSet.isStacked()) {
227230
for (let j = 0; j < buffer.size() * this.mAnimator.getPhaseX(); j += 4) {
228231
const x = (buffer.buffer[j] + buffer.buffer[j + 2]) / 2;
@@ -238,11 +241,11 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
238241
continue;
239242
}
240243

241-
if (dataSet.isDrawValuesEnabled()) {
244+
if (isDrawValuesEnabled) {
242245
this.drawValue(c, formatter.getBarLabel(val, entry), x, val >= 0 ? buffer.buffer[j + 1] + posOffset : buffer.buffer[j + 3] + negOffset, dataSet.getValueTextColor(j / 4));
243246
}
244247

245-
if (entry.icon != null && dataSet.isDrawIconsEnabled()) {
248+
if (isDrawIconsEnabled && entry.icon != null) {
246249
const icon = entry.icon;
247250

248251
let px = x;
@@ -281,7 +284,7 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
281284
continue;
282285
}
283286

284-
if (dataSet.isDrawValuesEnabled()) {
287+
if (isDrawValuesEnabled) {
285288
this.drawValue(
286289
c,
287290
formatter.getBarLabel(entry[yKey], entry),
@@ -291,7 +294,7 @@ export class BarChartRenderer extends BarLineScatterCandleBubbleRenderer {
291294
);
292295
}
293296

294-
if (entry.icon != null && dataSet.isDrawIconsEnabled()) {
297+
if (isDrawIconsEnabled && entry.icon != null ) {
295298
const icon = entry.icon;
296299

297300
let px = x;

‎src/charting/renderer/BubbleChartRenderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ export class BubbleChartRenderer extends BarLineScatterCandleBubbleRenderer {
100100
public drawValues(c: Canvas) {
101101
const data = this.mChart.getBubbleData();
102102
const dataSets = data.getDataSets();
103-
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled()) === false) {
103+
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled() || d.isDrawIconsEnabled()) === false) {
104104
return;
105105
}
106106

‎src/charting/renderer/CandleStickChartRenderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ export class CandleStickChartRenderer extends LineScatterCandleRadarRenderer {
212212
public drawValues(c: Canvas) {
213213
const data = this.mChart.getCandleData();
214214
const dataSets = data.getDataSets();
215-
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled()) === false) {
215+
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled() || d.isDrawIconsEnabled()) === false) {
216216
return;
217217
}
218218
// if values are drawn

‎src/charting/renderer/HorizontalBarChartRenderer.ts

+151-147
Large diffs are not rendered by default.

‎src/charting/renderer/LineChartRenderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ export class LineChartRenderer extends LineRadarRenderer {
632632
public drawValues(c: Canvas) {
633633
const data = this.mChart.getLineData();
634634
const dataSets = data.getDataSets();
635-
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled()) === false) {
635+
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled() || d.isDrawIconsEnabled()) === false) {
636636
return;
637637
}
638638

‎src/charting/renderer/PieChartRenderer.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ export class PieChartRenderer extends DataRenderer {
339339
const drawEntryLabels = this.mChart.isDrawEntryLabelsEnabled();
340340
const data = this.mChart.getData();
341341
const dataSets = data.getDataSets();
342-
if (!drawEntryLabels || dataSets.some(d=>d.isDrawValuesEnabled()) === false) {
342+
if (!drawEntryLabels || dataSets.some(d=>d.isDrawValuesEnabled() || d.isDrawIconsEnabled()) === false) {
343343
return;
344344
}
345345
const center = this.mChart.getCenterCircleBox();
@@ -407,6 +407,7 @@ export class PieChartRenderer extends DataRenderer {
407407

408408
const iconsOffset = dataSet.getIconsOffset();
409409

410+
const isDrawIconsEnabled = dataSet.isDrawIconsEnabled();
410411
for (let j = 0; j < entryCount; j++) {
411412
const entry = dataSet.getEntryForIndex(j);
412413

@@ -535,7 +536,7 @@ export class PieChartRenderer extends DataRenderer {
535536
}
536537
}
537538

538-
if (entry.icon != null && dataSet.isDrawIconsEnabled()) {
539+
if (isDrawIconsEnabled && entry.icon != null) {
539540
const icon = entry.icon;
540541

541542
const x = (labelRadius + iconsOffset.y) * sliceXBase + center.x;

‎src/charting/renderer/RadarChartRenderer.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ export class RadarChartRenderer extends LineRadarRenderer {
150150
public drawValues(c: Canvas) {
151151
const data = this.mChart.getData();
152152
const dataSets = data.getDataSets();
153-
if (dataSets.some(d=>d.isDrawValuesEnabled()) === false) {
153+
if (dataSets.some(d=>d.isDrawValuesEnabled() || d.isDrawIconsEnabled()) === false) {
154154
return;
155155
}
156156
const phaseX = this.mAnimator.getPhaseX();

‎src/charting/renderer/ScatterChartRenderer.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export class ScatterChartRenderer extends LineScatterCandleRadarRenderer {
7676
public drawValues(c: Canvas) {
7777
const data = this.mChart.getScatterData();
7878
const dataSets = data.getDataSets();
79-
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled()) === false) {
79+
if (!this.isDrawingValuesAllowed(this.mChart) || dataSets.some(d=>d.isDrawValuesEnabled() || d.isDrawIconsEnabled()) === false) {
8080
return;
8181
}
8282
// if values are drawn
@@ -101,7 +101,8 @@ export class ScatterChartRenderer extends LineScatterCandleRadarRenderer {
101101
const formatter = dataSet.getValueFormatter();
102102

103103
const iconsOffset = dataSet.getIconsOffset();
104-
104+
const drawValues = dataSet.isDrawValuesEnabled();
105+
const drawIcons = dataSet.isDrawIconsEnabled();
105106
for (let j = 0; j < count; j += 2) {
106107
if (!this.mViewPortHandler.isInBoundsRight(points[j])) break;
107108

@@ -110,11 +111,11 @@ export class ScatterChartRenderer extends LineScatterCandleRadarRenderer {
110111

111112
const entry = dataSet.getEntryForIndex(j / 2 + this.mXBounds.min);
112113

113-
if (dataSet.isDrawValuesEnabled()) {
114+
if (drawValues) {
114115
this.drawValue(c, formatter.getPointLabel(entry[yKey], entry), points[j], points[j + 1] - shapeSize, dataSet.getValueTextColor(j / 2 + this.mXBounds.min));
115116
}
116117

117-
if (entry.icon && dataSet.isDrawIconsEnabled()) {
118+
if (drawIcons && entry.icon ) {
118119
Utils.drawImage(c, entry.icon, points[j] + iconsOffset.x, points[j + 1] + iconsOffset.y);
119120
}
120121
}

0 commit comments

Comments
 (0)