|
13 | 13 | import com.github.mikephil.charting.data.DataSet; |
14 | 14 | import com.github.mikephil.charting.data.Entry; |
15 | 15 | import com.github.mikephil.charting.data.LineData; |
| 16 | +import com.github.mikephil.charting.data.LineDataSet; |
16 | 17 | import com.github.mikephil.charting.highlight.Highlight; |
17 | 18 | import com.github.mikephil.charting.interfaces.dataprovider.LineDataProvider; |
18 | 19 | import com.github.mikephil.charting.interfaces.datasets.ILineDataSet; |
@@ -205,7 +206,7 @@ protected void drawCubicBezier(Canvas c, ILineDataSet dataSet) { |
205 | 206 | Entry entryTo = dataSet.getEntryForXIndex(mMaxX, DataSet.Rounding.UP); |
206 | 207 |
|
207 | 208 | int diff = (entryFrom == entryTo) ? 1 : 0; |
208 | | - int minx = Math.max(dataSet.getEntryIndex(entryFrom) - diff, 0); |
| 209 | + int minx = Math.max(dataSet.getEntryIndex(entryFrom) - diff - 1, 0); |
209 | 210 | int maxx = Math.min(Math.max(minx + 2, dataSet.getEntryIndex(entryTo) + 1), entryCount); |
210 | 211 |
|
211 | 212 | float phaseX = Math.max(0.f, Math.min(1.f, mAnimator.getPhaseX())); |
@@ -563,6 +564,9 @@ public void drawValues(Canvas c) { |
563 | 564 | Entry entryTo = dataSet.getEntryForXIndex(mMaxX, DataSet.Rounding.UP); |
564 | 565 |
|
565 | 566 | int diff = (entryFrom == entryTo) ? 1 : 0; |
| 567 | + if (dataSet.getMode() == LineDataSet.Mode.CUBIC_BEZIER) |
| 568 | + diff += 1; |
| 569 | + |
566 | 570 | int minx = Math.max(dataSet.getEntryIndex(entryFrom) - diff, 0); |
567 | 571 | int maxx = Math.min(Math.max(minx + 2, dataSet.getEntryIndex(entryTo) + 1), entryCount); |
568 | 572 |
|
@@ -626,6 +630,9 @@ protected void drawCircles(Canvas c) { |
626 | 630 | Entry entryTo = dataSet.getEntryForXIndex(mMaxX, DataSet.Rounding.UP); |
627 | 631 |
|
628 | 632 | int diff = (entryFrom == entryTo) ? 1 : 0; |
| 633 | + if (dataSet.getMode() == LineDataSet.Mode.CUBIC_BEZIER) |
| 634 | + diff += 1; |
| 635 | + |
629 | 636 | int minx = Math.max(dataSet.getEntryIndex(entryFrom) - diff, 0); |
630 | 637 | int maxx = Math.min(Math.max(minx + 2, dataSet.getEntryIndex(entryTo) + 1), entryCount); |
631 | 638 |
|
|
0 commit comments