Skip to content

Cleanup BarDataset #529

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 2 commits into from
Dec 22, 2025
Merged

Cleanup BarDataset #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6236a02
CleanupHighLighter
hannesa2 Dec 22, 2025
915d1bf
Cleanup BarDataset
hannesa2 Dec 22, 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
12 changes: 6 additions & 6 deletions MPChartLib/src/main/java/com/github/mikephil/charting/data/BarDataSet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ open class BarDataSet(yVals: MutableList<BarEntry>, label: String = "") : BarLin
* Use getFills() instead.
*/
@get:Deprecated("")
var gradients: MutableList<Fill?>? = null
var gradients: MutableList<Fill>? = null
protected set

init {
Expand Down Expand Up @@ -82,7 +82,7 @@ open class BarDataSet(yVals: MutableList<BarEntry>, label: String = "") : BarLin
barDataSet.mHighLightAlpha = mHighLightAlpha
}

override fun getFills(): MutableList<Fill?>? {
override fun getFills(): MutableList<Fill>? {
return this.gradients
}

Expand All @@ -99,19 +99,19 @@ open class BarDataSet(yVals: MutableList<BarEntry>, label: String = "") : BarLin
* Sets the start and end color for gradient color, ONLY color that should be used for this DataSet.
*/
fun setGradientColor(startColor: Int, endColor: Int) {
gradients!!.clear()
gradients!!.add(Fill(startColor, endColor))
gradients?.clear()
gradients?.add(Fill(startColor, endColor))
}

@Deprecated("Use setFills(...) instead")
fun setGradientColors(gradientColors: MutableList<Fill?>?) {
fun setGradientColors(gradientColors: MutableList<Fill>?) {
this.gradients = gradientColors
}

/**
* Sets the fills for the bars in this dataset.
*/
fun setFills(fills: MutableList<Fill?>?) {
fun setFills(fills: MutableList<Fill>?) {
this.gradients = fills
}

Expand Down
9 changes: 5 additions & 4 deletions MPChartLib/src/main/java/com/github/mikephil/charting/highlight/ChartHighlighter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte
var distance = Float.MAX_VALUE

for (i in closestValues.indices) {
val high = closestValues.get(i)
val high = closestValues[i]

if (high.axis == axis) {
val tempDistance = abs(getHighlightPos(high) - pos)
Expand Down Expand Up @@ -112,6 +112,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte
/**
* An array of `Highlight` objects corresponding to the selected xValue and dataSetIndex.
*/
@Suppress("SameParameterValue")
protected open fun buildHighlights(set: IDataSet<*>, dataSetIndex: Int, xVal: Float, rounding: DataSet.Rounding?): MutableList<Highlight> {
val highlights = ArrayList<Highlight>()

Expand All @@ -129,7 +130,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte

if (entries != null)
for (e in entries) {
val pixels = provider!!.getTransformer(set.axisDependency)!!.getPixelForValues(e.x, e.y)
val pixels = provider.getTransformer(set.axisDependency)!!.getPixelForValues(e.x, e.y)

highlights.add(
Highlight(
Expand Down Expand Up @@ -159,7 +160,7 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte
var distance = minSelectionDistance

for (i in closestValues.indices) {
val high = closestValues.get(i)
val high = closestValues[i]

if (axis == null || high.axis == axis) {
val cDistance = getDistance(x, y, high.xPx, high.yPx)
Expand All @@ -184,5 +185,5 @@ open class ChartHighlighter<T : BarLineScatterCandleBubbleDataProvider>(protecte
}

protected open val data: BarLineScatterCandleBubbleData<*>
get() = provider!!.getData()
get() = provider.getData()
}
20 changes: 10 additions & 10 deletions MPChartLib/src/main/java/com/github/mikephil/charting/highlight/RadarHighlighter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
override fun getClosestHighlight(index: Int, x: Float, y: Float): Highlight? {
val highlights = getHighlightsAtIndex(index)

val distanceToCenter = chartPieRadar!!.distanceToCenter(x, y) / chartPieRadar!!.getFactor()
val distanceToCenter = chartPieRadar.distanceToCenter(x, y) / chartPieRadar.getFactor()

var closest: Highlight? = null
var distance = Float.MAX_VALUE
Expand All @@ -38,22 +38,22 @@ open class RadarHighlighter(chart: RadarChart) : PieRadarHighlighter<RadarChart>
protected fun getHighlightsAtIndex(index: Int): MutableList<Highlight> {
mHighlightBuffer.clear()

val phaseX = chartPieRadar!!.animator.phaseX
val phaseY = chartPieRadar!!.animator.phaseY
val sliceAngle = chartPieRadar!!.sliceAngle
val factor = chartPieRadar!!.getFactor()
val phaseX = chartPieRadar.animator.phaseX
val phaseY = chartPieRadar.animator.phaseY
val sliceAngle = chartPieRadar.sliceAngle
val factor = chartPieRadar.getFactor()

val pOut = MPPointF.getInstance(0f, 0f)
for (i in 0..<chartPieRadar!!.data!!.getDataSetCount()) {
val dataSet: IDataSet<*> = chartPieRadar!!.data!!.getDataSetByIndex(i)
for (i in 0..<chartPieRadar.data!!.getDataSetCount()) {
val dataSet: IDataSet<*> = chartPieRadar.data!!.getDataSetByIndex(i)

val entry: Entry? = dataSet.getEntryForIndex(index)

val y = (entry!!.y - chartPieRadar!!.yChartMin)
val y = (entry!!.y - chartPieRadar.yChartMin)

Utils.getPosition(
chartPieRadar!!.centerOffsets, y * factor * phaseY,
sliceAngle * index * phaseX + chartPieRadar!!.rotationAngle, pOut
chartPieRadar.centerOffsets, y * factor * phaseY,
sliceAngle * index * phaseX + chartPieRadar.rotationAngle, pOut
)

mHighlightBuffer.add(Highlight(index.toFloat(), entry.y, pOut.x, pOut.y, i, dataSet.axisDependency))
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -167,7 +167,7 @@ class BarChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
val endColor4 = ContextCompat.getColor(this, android.R.color.holo_red_dark)
val endColor5 = ContextCompat.getColor(this, android.R.color.holo_orange_dark)

val gradientFills: MutableList<Fill?> = ArrayList()
val gradientFills: MutableList<Fill> = ArrayList()
gradientFills.add(Fill(startColor1, endColor1))
gradientFills.add(Fill(startColor2, endColor2))
gradientFills.add(Fill(startColor3, endColor3))
Expand Down
Loading