Skip to content

Update our custom MPAndroid chart to be based on the official v3.1.0 release #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ewisor merged 8 commits into from
Apr 4, 2025
Merged

Update our custom MPAndroid chart to be based on the official v3.1.0 release #7

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
24eb60e
Added a PieDataSet option to not draw pie chart slice text if percent…
Jun 29, 2017
56b9acc
Changed newly added threshold default to 0.0% so text is normally alw…
Jun 29, 2017
97afcbd
Labels at specific positions for x and y axis #2692
Jul 11, 2017
d824baf
adding checks to make sure we don't cause an IndexOutOfBoundsExceptio…
Aug 15, 2017
eeee52b
Fix for ArrayIndexOutOfBoundsException - when highlighting full bar o…
Aug 16, 2017
8a73695
Andromeda customizations to sup[port showing breaks/gaps in line charts.
Dec 11, 2017
c65f2f5
Set the default "No Data Value" to the largest negative float value (…
Dec 12, 2017
bd836f6
Changed default no data value to Float.NaN - this guarantees the newl…
Dec 12, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Andromeda customizations to sup[port showing breaks/gaps in line charts. 
(cherry picked from commit d7e69b9)
  • Loading branch information
ewisor ewisor
ewisor authored and ewisor committed Apr 3, 2025
commit 8a736957cded62db603474d4423ca83711486dcf
74 changes: 65 additions & 9 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,22 @@ public class LineChartRenderer extends LineRadarRenderer {
protected Path cubicPath = new Path();
protected Path cubicFillPath = new Path();

// Andromeda Additions
private float noDataValue = Float.MIN_VALUE;
private float noDataTransitionWidth = 0.33f; // As a percent of the normal entry width
public void setNoDataValue(float noDataValue) {
this.noDataValue = noDataValue;
}
public void setNoDataTransitionWidth(float noDataTransitionWidth) {
this.noDataTransitionWidth = noDataTransitionWidth;
}
private float getAdjustedY(Entry entry, float fillMin) {
return (isNoDataValue(entry) ? fillMin : entry.getY());
}
private boolean isNoDataValue(Entry entry) {
return (entry == null || entry.getY() <= noDataValue);
}

public LineChartRenderer(LineDataProvider chart, ChartAnimator animator,
ViewPortHandler viewPortHandler) {
super(animator, viewPortHandler);
Expand Down Expand Up @@ -394,24 +410,48 @@ protected void drawLinear(Canvas c, ILineDataSet dataSet) {

if (e1 == null || e2 == null) continue;

if (isNoDataValue(e1) || (!isDrawSteppedEnabled && isNoDataValue(e2))) {
// If the previous sample is valid but the current one is not
if(!isNoDataValue(e1) && isNoDataValue(e2)) {
// Draw a no data transition leaving the previous entry
mLineBuffer[j++] = e1.getX();
mLineBuffer[j++] = e1.getY() * phaseY;
mLineBuffer[j++] = e1.getX() + noDataTransitionWidth;
mLineBuffer[j++] = e1.getY() * phaseY;
}
// If the previous sample was not valid and the current one is valid
else if(isNoDataValue(e1) && !isNoDataValue(e2) && !isDrawSteppedEnabled) {
// Draw a no data transition entering the current entry
mLineBuffer[j++] = e2.getX() - noDataTransitionWidth;
mLineBuffer[j++] = e2.getY() * phaseY;
mLineBuffer[j++] = e2.getX();
mLineBuffer[j++] = e2.getY() * phaseY;
}
continue;
}

mLineBuffer[j++] = e1.getX();
mLineBuffer[j++] = e1.getY() * phaseY;

if (isDrawSteppedEnabled) {
mLineBuffer[j++] = e2.getX();
mLineBuffer[j++] = e1.getY() * phaseY;
mLineBuffer[j++] = e2.getX();
mLineBuffer[j++] = e1.getY() * phaseY;
if (!isNoDataValue(e2)) {
mLineBuffer[j++] = e2.getX();
mLineBuffer[j++] = e1.getY() * phaseY;
}
}

mLineBuffer[j++] = e2.getX();
mLineBuffer[j++] = e2.getY() * phaseY;
if (!isNoDataValue(e2)) {
mLineBuffer[j++] = e2.getX();
mLineBuffer[j++] = e2.getY() * phaseY;
}
}

if (j > 0) {
trans.pointValuesToPixel(mLineBuffer);

final int size = Math.max((mXBounds.range + 1) * pointsPerEntryPair, pointsPerEntryPair) * 2;
final int size = j; // Math.max((mXBounds.range + 1) * pointsPerEntryPair, pointsPerEntryPair) * 2;

mRenderPaint.setColor(dataSet.getColor());

Expand Down Expand Up @@ -493,7 +533,7 @@ private void generateFilledPath(final ILineDataSet dataSet, final int startIndex
final Entry entry = dataSet.getEntryForIndex(startIndex);

filled.moveTo(entry.getX(), fillMin);
filled.lineTo(entry.getX(), entry.getY() * phaseY);
filled.lineTo(entry.getX(), getAdjustedY(entry, fillMin) * phaseY);

// create a new path
Entry currentEntry = null;
Expand All @@ -502,12 +542,28 @@ private void generateFilledPath(final ILineDataSet dataSet, final int startIndex

currentEntry = dataSet.getEntryForIndex(x);

// Changes to show gaps for no data. Note: The stepped and non-stepped implementations
// are similar and could be optimized for code size however That will make each code path
// harder to follow.
if (isDrawSteppedEnabled) {
filled.lineTo(currentEntry.getX(), previousEntry.getY() * phaseY);
filled.lineTo(currentEntry.getX(), getAdjustedY(previousEntry, fillMin) * phaseY);
filled.lineTo(currentEntry.getX(), getAdjustedY(currentEntry, fillMin) * phaseY);
} else {
if (isNoDataValue(previousEntry)) {
if (!isNoDataValue(currentEntry)) {
filled.lineTo(currentEntry.getX() - noDataTransitionWidth, getAdjustedY(previousEntry, fillMin) * phaseY);
filled.lineTo(currentEntry.getX() - noDataTransitionWidth, getAdjustedY(currentEntry, fillMin) * phaseY);
}
else {
filled.lineTo(currentEntry.getX(), getAdjustedY(previousEntry, fillMin) * phaseY);
}
} else if (isNoDataValue(currentEntry)) {
filled.lineTo(previousEntry.getX() + noDataTransitionWidth, getAdjustedY(previousEntry, fillMin) * phaseY);
filled.lineTo(previousEntry.getX() + noDataTransitionWidth, fillMin * phaseY);
}
filled.lineTo(currentEntry.getX(), getAdjustedY(currentEntry, fillMin) * phaseY);
}

filled.lineTo(currentEntry.getX(), currentEntry.getY() * phaseY);

previousEntry = currentEntry;
}

Expand Down