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

Show file tree
Hide file tree
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
Labels at specific positions for x and y axis PhilJay#2692 
(cherry picked from commit c85e212)
  • Loading branch information
Raji ewisor
Raji authored and ewisor committed Apr 3, 2025
commit 97afcbd54a92edecc7dfaac79179d741f349876d
33 changes: 33 additions & 0 deletions MPChartLib/src/main/java/com/github/mikephil/charting/components/AxisBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,16 @@ public abstract class AxisBase extends ComponentBase {
*/
public float mAxisRange = 0f;

/**
* if true, then labels are displayed using specificLabelPositions instead of computed ones
*/
private boolean showSpecificLabelPositions = false;

/**
* specify to which values labels must be displayed. has no effect if not used showSpecificLabelPositions set to true
*/
private float[] specificLabelPositions = new float[]{};

/**
* default constructor
*/
Expand Down Expand Up @@ -779,4 +789,27 @@ public void setSpaceMax(float mSpaceMax)
{
this.mSpaceMax = mSpaceMax;
}

/**
* if set to true, labels will be displayed at the specific positions passed in via setSpecificLabelPositions
*/
public void setShowSpecificLabelPositions(boolean showSpecificLabelPositions)
{
this.showSpecificLabelPositions = showSpecificLabelPositions;
}

public boolean isShowSpecificLabelPositions()
{
return showSpecificLabelPositions;
}

public void setSpecificLabelPositions(float[] specificLabelPositions)
{
this.specificLabelPositions = specificLabelPositions;
}

public float[] getSpecificLabelPositions()
{
return specificLabelPositions;
}
}
25 changes: 17 additions & 8 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/XAxisRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,20 @@ protected void drawLabels(Canvas c, float pos, MPPointF anchor) {

float[] positions = new float[mXAxis.mEntryCount * 2];

for (int i = 0; i < positions.length; i += 2) {

// only fill x values
if (centeringEnabled) {
positions[i] = mXAxis.mCenteredEntries[i / 2];
} else {
positions[i] = mXAxis.mEntries[i / 2];
if (mXAxis.isShowSpecificLabelPositions()) {
positions = new float[mXAxis.getSpecificLabelPositions().length * 2];
for (int i = 0; i < positions.length; i += 2) {
positions[i] = mXAxis.getSpecificLabelPositions()[i / 2];
}
} else {
for (int i = 0; i < positions.length; i += 2) {

// only fill x values
if (centeringEnabled) {
positions[i] = mXAxis.mCenteredEntries[i / 2];
} else {
positions[i] = mXAxis.mEntries[i / 2];
}
}
}

Expand All @@ -201,7 +208,9 @@ protected void drawLabels(Canvas c, float pos, MPPointF anchor) {

if (mViewPortHandler.isInBoundsX(x)) {

String label = mXAxis.getValueFormatter().getAxisLabel(mXAxis.mEntries[i / 2], mXAxis);
String label = mXAxis.isShowSpecificLabelPositions() ?
mXAxis.getValueFormatter().getAxisLabel(mXAxis.getSpecificLabelPositions()[i / 2], mXAxis)
: mXAxis.getValueFormatter().getAxisLabel(mXAxis.mEntries[i / 2], mXAxis);

if (mXAxis.isAvoidFirstLastClippingEnabled()) {

Expand Down
17 changes: 17 additions & 0 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,23 @@ public void renderAxisLine(Canvas c) {
*/
protected void drawYLabels(Canvas c, float fixedPosition, float[] positions, float offset) {

if (mYAxis.isShowSpecificLabelPositions()) {
float[] specificLabelsPositions = new float[mYAxis.getSpecificLabelPositions().length * 2];
for (int i = 0; i < mYAxis.getSpecificLabelPositions().length; i++) {
specificLabelsPositions[i * 2 + 1] = mYAxis.getSpecificLabelPositions()[i];
}
mTrans.pointValuesToPixel(specificLabelsPositions);

for (int i = 0; i < mYAxis.getSpecificLabelPositions().length; i++) {
float y = specificLabelsPositions[i * 2 + 1];
if (mViewPortHandler.isInBoundsY(y)) {
String text = mYAxis.getValueFormatter().getFormattedValue(mYAxis.getSpecificLabelPositions()[i], mYAxis);
c.drawText(text, fixedPosition, y + offset, mAxisLabelPaint);
}
}
return;
}

final int from = mYAxis.isDrawBottomYLabelEntryEnabled() ? 0 : 1;
final int to = mYAxis.isDrawTopYLabelEntryEnabled()
? mYAxis.mEntryCount
Expand Down