Skip to content

Modified and expanded, made more flexible marker interaction interface #4817

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

Open
devnullorthrow wants to merge 1 commit into
base: master
Choose a base branch
from
+27 −14
Open

Modified and expanded, made more flexible marker interaction interface #4817

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 22 additions & 11 deletions MPChartLib/src/main/java/com/github/mikephil/charting/charts/Chart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import android.graphics.RectF;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.Environment;
import android.provider.MediaStore.Images;
import androidx.annotation.RequiresApi;
Expand All @@ -25,7 +24,6 @@
import android.view.ViewParent;

import com.github.mikephil.charting.animation.ChartAnimator;
import com.github.mikephil.charting.animation.Easing;
import com.github.mikephil.charting.animation.Easing.EasingFunction;
import com.github.mikephil.charting.components.Description;
import com.github.mikephil.charting.components.IMarker;
Expand Down Expand Up @@ -54,6 +52,8 @@
import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

/**
* Baseclass of all Chart-Views.
Expand Down Expand Up @@ -563,6 +563,12 @@ public void highlightValues(Highlight[] highs) {
invalidate();
}

public void highlightValues(List<Highlight> highs, List<IMarker> markers) {
if (highs.size() != markers.size()) throw new IllegalArgumentException("Markers and highs must be mutually corresponding. High size = " + highs.size() + " Markers size = " + markers.size());
setMarkers(markers);
highlightValues(highs.toArray(new Highlight[0]));
}

/**
* Highlights any y-value at the given x-value in the given DataSet.
* Provide -1 as the dataSetIndex to undo all highlighting.
Expand Down Expand Up @@ -772,15 +778,15 @@ public ChartTouchListener getOnTouchListener() {
/**
* the view that represents the marker
*/
protected IMarker mMarker;
protected List<IMarker> mMarkers;

/**
* draws all MarkerViews on the highlighted positions
*/
protected void drawMarkers(Canvas canvas) {

// if there is no marker view or drawing marker is disabled
if (mMarker == null || !isDrawMarkersEnabled() || !valuesToHighlight())
if (mMarkers == null || !isDrawMarkersEnabled() || !valuesToHighlight())
return;

for (int i = 0; i < mIndicesToHighlight.length; i++) {
Expand All @@ -803,10 +809,12 @@ protected void drawMarkers(Canvas canvas) {
continue;

// callbacks to update the content
mMarker.refreshContent(e, highlight);
int markerIndex = i % mMarkers.size();
IMarker markerItem = mMarkers.get(markerIndex);
markerItem.refreshContent(e, highlight);

// draw the marker
mMarker.draw(canvas, pos[0], pos[1]);
markerItem.draw(canvas, pos[0], pos[1]);
}
}

Expand Down Expand Up @@ -1246,22 +1254,25 @@ public void setTouchEnabled(boolean enabled) {
this.mTouchEnabled = enabled;
}

public void setMarkers(List<IMarker> marker) {
mMarkers = marker;
}

/**
* sets the marker that is displayed when a value is clicked on the chart
*
* @param marker
*/
public void setMarker(IMarker marker) {
mMarker = marker;
setMarkers(Collections.unmodifiableList(Collections.singletonList(marker)));
}

/**
* returns the marker that is set as a marker view for the chart
*
* @return
*/
public IMarker getMarker() {
return mMarker;
public List<IMarker> getMarker() {
return mMarkers;
}

@Deprecated
Expand All @@ -1270,7 +1281,7 @@ public void setMarkerView(IMarker v) {
}

@Deprecated
public IMarker getMarkerView() {
public List<IMarker> getMarkerView() {
return getMarker();
}

Expand Down
8 changes: 5 additions & 3 deletions MPChartLib/src/main/java/com/github/mikephil/charting/charts/CombinedChart.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import android.util.AttributeSet;
import android.util.Log;

import com.github.mikephil.charting.components.IMarker;
import com.github.mikephil.charting.data.BarData;
import com.github.mikephil.charting.data.BubbleData;
import com.github.mikephil.charting.data.CandleData;
Expand Down Expand Up @@ -236,7 +237,7 @@ public void setDrawOrder(DrawOrder[] order) {
protected void drawMarkers(Canvas canvas) {

// if there is no marker view or drawing marker is disabled
if (mMarker == null || !isDrawMarkersEnabled() || !valuesToHighlight())
if (mMarkers == null || !isDrawMarkersEnabled() || !valuesToHighlight())
return;

for (int i = 0; i < mIndicesToHighlight.length; i++) {
Expand All @@ -262,10 +263,11 @@ protected void drawMarkers(Canvas canvas) {
continue;

// callbacks to update the content
mMarker.refreshContent(e, highlight);
IMarker markerItem = mMarkers.get(i % mMarkers.size());
markerItem.refreshContent(e, highlight);

// draw the marker
mMarker.draw(canvas, pos[0], pos[1]);
markerItem.draw(canvas, pos[0], pos[1]);
}
}

Expand Down