diff options
| author | Daniel Cohen Gindi <danielgindi@gmail.com> | 2020-01-23 12:09:06 +0200 |
|---|---|---|
| committer | Daniel Cohen Gindi <danielgindi@gmail.com> | 2020-01-23 12:09:06 +0200 |
| commit | 5e4a32eb414b074a61b6655c55fa713105eb0195 (patch) | |
| tree | ab2d430fff1078c53d780029aee213a53385ea0d | |
| parent | 1de836ac650e45ac1dd7e905368016c8fdd6aeef (diff) | |
| download | MPAndroidChart-5e4a32eb414b074a61b6655c55fa713105eb0195.tar.gz | |
Corrected check for line in vertical bounds
https://github.com/danielgindi/Charts/pull/4100
| -rw-r--r-- | MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java index 2b3c5241..849bc4a7 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java @@ -323,8 +323,10 @@ public class LineChartRenderer extends LineRadarRenderer { // more than 1 color if (dataSet.getColors().size() > 1) { - if (mLineBuffer.length <= pointsPerEntryPair * 2) - mLineBuffer = new float[pointsPerEntryPair * 4]; + int numberOfFloats = pointsPerEntryPair * 2; + + if (mLineBuffer.length <= numberOfFloats) + mLineBuffer = new float[numberOfFloats * 2]; int max = mXBounds.min + mXBounds.range; @@ -359,16 +361,26 @@ public class LineChartRenderer extends LineRadarRenderer { mLineBuffer[3] = mLineBuffer[1]; } + // Determine the start and end coordinates of the line, and make sure they differ. + float firstCoordinateX = mLineBuffer[0]; + float firstCoordinateY = mLineBuffer[1]; + float lastCoordinateX = mLineBuffer[numberOfFloats - 2]; + float lastCoordinateY = mLineBuffer[numberOfFloats - 1]; + + if (firstCoordinateX == lastCoordinateX && + firstCoordinateY == lastCoordinateY) + continue; + trans.pointValuesToPixel(mLineBuffer); - if (!mViewPortHandler.isInBoundsRight(mLineBuffer[0])) + if (!mViewPortHandler.isInBoundsRight(firstCoordinateX)) break; // make sure the lines don't do shitty things outside // bounds - if (!mViewPortHandler.isInBoundsLeft(mLineBuffer[2]) - || (!mViewPortHandler.isInBoundsTop(mLineBuffer[1]) && !mViewPortHandler - .isInBoundsBottom(mLineBuffer[3]))) + if (!mViewPortHandler.isInBoundsLeft(lastCoordinateX) || + !mViewPortHandler.isInBoundsTop(lastCoordinateY) || + !mViewPortHandler.isInBoundsBottom(firstCoordinateY)) continue; // get the color that is set for this line-segment |