Skip to content

Interface change isDrawValues() #496

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
hannesa2 merged 3 commits into from
Dec 17, 2025
Merged

Interface change isDrawValues() #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ecfb54
Interface change
hannesa2 Dec 17, 2025
7138bc1
Use foreach
hannesa2 Dec 17, 2025
23cfac9
Interface change isDrawIcons
hannesa2 Dec 17, 2025
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
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/data/BaseDataSet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,15 +319,15 @@ abstract class BaseDataSet<T : Entry>() : IDataSet<T> {
this.mDrawValues = enabled
}

override fun isDrawValuesEnabled(): Boolean {
override fun isDrawValues(): Boolean {
return mDrawValues
}

override fun setDrawIcons(enabled: Boolean) {
mDrawIcons = enabled
}

override fun isDrawIconsEnabled(): Boolean {
override fun isDrawIcons(): Boolean {
return mDrawIcons
}

Expand Down
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IDataSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,7 @@ public interface IDataSet<T extends Entry> {
/**
* Returns true if y-value drawing is enabled, false if not
*/
boolean isDrawValuesEnabled();
boolean isDrawValues();

/**
* Set this to true to draw y-icons on the chart.
Expand All @@ -342,7 +342,7 @@ public interface IDataSet<T extends Entry> {
/**
* Returns true if y-icon drawing is enabled, false if not
*/
boolean isDrawIconsEnabled();
boolean isDrawIcons();

/**
* Offset of icons drawn on the chart.
Expand Down
12 changes: 6 additions & 6 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,15 +314,15 @@ open class BarChartRenderer(
val entry = dataSet.getEntryForIndex(j / 4)
val `val` = entry.y

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas, dataSet.valueFormatter, `val`, entry, i, x,
if (`val` >= 0) (buffer.buffer[j + 1] + posOffset) else (buffer.buffer[j + 3] + negOffset),
dataSet.getValueTextColor(j / 4)
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

var px = x
Expand Down Expand Up @@ -372,7 +372,7 @@ open class BarChartRenderer(
continue
}

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas, dataSet.valueFormatter, entry.y, entry, i, x,
buffer.buffer[bufferIndex + 1] +
Expand All @@ -381,7 +381,7 @@ open class BarChartRenderer(
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

var px = x
Expand Down Expand Up @@ -454,7 +454,7 @@ open class BarChartRenderer(
continue
}

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas,
dataSet.valueFormatter,
Expand All @@ -467,7 +467,7 @@ open class BarChartRenderer(
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

icon?.let {
Expand Down
2 changes: 1 addition & 1 deletion ...src/main/java/com/github/mikephil/charting/renderer/BarLineScatterCandleBubbleRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ abstract class BarLineScatterCandleBubbleRenderer(animator: ChartAnimator, viewP
* Returns true if the DataSet values should be drawn, false if not.
*/
protected fun shouldDrawValues(set: IDataSet<*>): Boolean {
return set.isVisible() && (set.isDrawValuesEnabled() || set.isDrawIconsEnabled())
return set.isVisible() && (set.isDrawValues() || set.isDrawIcons())
}

/**
Expand Down
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/BubbleChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,14 @@ open class BubbleChartRenderer(

val entry = dataSet.getEntryForIndex(j / 2 + xBounds.min)

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas, dataSet.valueFormatter, entry.size, entry, i, x,
y + (0.5f * lineHeight), valueTextColor
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

icon?.let {
Expand Down
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/CandleStickChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ open class CandleStickChartRenderer(

val entry = dataSet.getEntryForIndex(j / 2 + xBounds.min)

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas,
dataSet.valueFormatter,
Expand All @@ -264,7 +264,7 @@ open class CandleStickChartRenderer(
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

icon?.let {
Expand Down
12 changes: 6 additions & 6 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/HorizontalBarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,7 @@ open class HorizontalBarChartRenderer(
negOffset = -negOffset - valueTextWidth
}

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas,
formattedValue!!,
Expand All @@ -244,7 +244,7 @@ open class HorizontalBarChartRenderer(
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

var px = buffer.buffer[j + 2] + (if (`val` >= 0) posOffset else negOffset)
Expand Down Expand Up @@ -310,7 +310,7 @@ open class HorizontalBarChartRenderer(
negOffset = -negOffset - valueTextWidth
}

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas, formattedValue!!,
buffer.buffer[bufferIndex + 2]
Expand All @@ -319,7 +319,7 @@ open class HorizontalBarChartRenderer(
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

var px = (buffer.buffer[bufferIndex + 2]
Expand Down Expand Up @@ -410,11 +410,11 @@ open class HorizontalBarChartRenderer(
continue
}

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(canvas, formattedValue!!, x, y + halfTextHeight, color)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

icon?.let {
Expand Down
14 changes: 7 additions & 7 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ open class LineChartRenderer(
return

paintRender.strokeWidth = dataSet.lineWidth
paintRender.setPathEffect(dataSet.dashPathEffect)
paintRender.pathEffect = dataSet.dashPathEffect

when (dataSet.lineMode) {
LineDataSet.Mode.LINEAR, LineDataSet.Mode.STEPPED -> drawLinear(canvas, dataSet)
Expand All @@ -97,7 +97,7 @@ open class LineChartRenderer(
else -> drawLinear(canvas, dataSet)
}

paintRender.setPathEffect(null)
paintRender.pathEffect = null
}

protected fun drawHorizontalBezier(dataSet: ILineDataSet) {
Expand Down Expand Up @@ -147,7 +147,7 @@ open class LineChartRenderer(

bitmapCanvas!!.drawPath(cubicPath, paintRender)

paintRender.setPathEffect(null)
paintRender.pathEffect = null
}

protected fun drawCubicBezier(dataSet: ILineDataSet) {
Expand Down Expand Up @@ -221,7 +221,7 @@ open class LineChartRenderer(

bitmapCanvas!!.drawPath(cubicPath, paintRender)

paintRender.setPathEffect(null)
paintRender.pathEffect = null
}

protected fun drawCubicFill(canvas: Canvas, dataSet: ILineDataSet, spline: Path, trans: Transformer, bounds: XBounds) {
Expand Down Expand Up @@ -379,7 +379,7 @@ open class LineChartRenderer(
}
}

paintRender.setPathEffect(null)
paintRender.pathEffect = null
}

protected var mGenerateFilledPathBuffer: Path = Path()
Expand Down Expand Up @@ -532,14 +532,14 @@ open class LineChartRenderer(
val entry = dataSet.getEntryForIndex(j / 2 + xBounds.min)

if (entry != null) {
if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas, dataSet.valueFormatter, entry.y, entry, i, x,
y - valOffset, dataSet.getValueTextColor(j / 2)
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

icon?.let {
Expand Down
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/PieChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@ open class PieChartRenderer(
if (dataSet.entryCount == 0) {
continue
}
val drawValues = dataSet.isDrawValuesEnabled
val drawValues = dataSet.isDrawValues
if (!drawValues && !drawEntryLabels) {
continue
}
Expand Down Expand Up @@ -586,7 +586,7 @@ open class PieChartRenderer(
}
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

val x = (labelRadius + iconsOffset.y) * sliceXBase + center.x
Expand Down
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/RadarChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ open class RadarChartRenderer(
pOut
)

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas,
dataSet.valueFormatter,
Expand All @@ -169,7 +169,7 @@ open class RadarChartRenderer(
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

Utils.getPosition(
Expand Down
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/renderer/ScatterChartRenderer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ open class ScatterChartRenderer(@JvmField var dataProvider: ScatterDataProvider,

val entry = dataSet.getEntryForIndex(j / 2 + xBounds.min)

if (dataSet.isDrawValuesEnabled) {
if (dataSet.isDrawValues) {
drawValue(
canvas,
dataSet.valueFormatter,
Expand All @@ -129,7 +129,7 @@ open class ScatterChartRenderer(@JvmField var dataProvider: ScatterDataProvider,
)
}

if (entry.icon != null && dataSet.isDrawIconsEnabled) {
if (entry.icon != null && dataSet.isDrawIcons) {
val icon = entry.icon

icon?.let {
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/kotlin/info/appdev/chartexample/AnotherBarActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,9 @@ class AnotherBarActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleValues -> {
for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled())

chart!!.data!!.dataSets.forEach { set ->
set.setDrawValues(!set.isDrawValues())
}
chart!!.invalidate()
}

Expand Down
8 changes: 4 additions & 4 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,15 +202,15 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
}

R.id.actionToggleValues -> {
for (set in chart!!.data!!.dataSets)
set.setDrawValues(!set.isDrawValuesEnabled())

chart!!.data!!.dataSets.forEach { set ->
set.setDrawValues(!set.isDrawValues())
}
chart!!.invalidate()
}

R.id.actionToggleIcons -> {
for (set in chart!!.data!!.dataSets)
set.setDrawIcons(!set.isDrawIconsEnabled())
set.setDrawIcons(!set.isDrawIcons())

chart!!.invalidate()
}
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivityMultiDataset.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,9 @@ class BarChartActivityMultiDataset : DemoBase(), OnSeekBarChangeListener, OnChar
}

R.id.actionToggleValues -> {
for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled())

chart!!.data!!.dataSets.forEach { set ->
set.setDrawValues(!set.isDrawValues())
}
chart!!.invalidate()
}

Expand Down
5 changes: 3 additions & 2 deletions app/src/main/kotlin/info/appdev/chartexample/BarChartActivitySinus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,9 @@ class BarChartActivitySinus : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleValues -> {
for (set in binding.chart1.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled())

binding.chart1.data!!.dataSets.forEach { set ->
set.setDrawValues(!set.isDrawValues())
}
binding.chart1.invalidate()
}

Expand Down
7 changes: 4 additions & 3 deletions app/src/main/kotlin/info/appdev/chartexample/BubbleChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,14 @@ class BubbleChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSel
}

R.id.actionToggleValues -> {
for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled())

chart!!.data!!.dataSets.forEach { set ->
set.setDrawValues(!set.isDrawValues())
}
chart!!.invalidate()
}

R.id.actionToggleIcons -> {
for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIconsEnabled())
for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIcons())

chart!!.invalidate()
}
Expand Down
7 changes: 4 additions & 3 deletions app/src/main/kotlin/info/appdev/chartexample/CandleStickChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,14 @@ class CandleStickChartActivity : DemoBase(), OnSeekBarChangeListener {
}

R.id.actionToggleValues -> {
for (set in chart!!.data!!.dataSets) set.setDrawValues(!set.isDrawValuesEnabled())

chart!!.data!!.dataSets.forEach { set ->
set.setDrawValues(!set.isDrawValues())
}
chart!!.invalidate()
}

R.id.actionToggleIcons -> {
for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIconsEnabled())
for (set in chart!!.data!!.dataSets) set.setDrawIcons(!set.isDrawIcons())

chart!!.invalidate()
}
Expand Down
Loading
Loading