From b42b7e02c38b2f95cafbb5622f0e366b545cf4e4 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Wed, 17 Dec 2025 09:56:32 +0100 Subject: [PATCH] Line interface change --- .../github/mikephil/charting/data/LineDataSet.java | 4 ++-- .../charting/interfaces/datasets/ILineDataSet.java | 2 +- .../mikephil/charting/renderer/LineChartRenderer.kt | 4 ++-- .../appdev/chartexample/CombinedChartActivity.kt | 2 +- .../appdev/chartexample/CubicLineChartActivity.kt | 8 ++++---- .../info/appdev/chartexample/LineChartActivity.kt | 6 +++--- .../appdev/chartexample/LineChartDualAxisActivity.kt | 6 +++--- .../appdev/chartexample/LineChartTimeActivity.kt | 12 ++++++------ .../appdev/chartexample/MultiLineChartActivity.kt | 6 +++--- .../info/appdev/chartexample/PerformanceLineChart.kt | 2 +- .../SpecificPositionsLineChartActivity.kt | 6 +++--- 11 files changed, 29 insertions(+), 29 deletions(-) diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java index 5f9ded430..379d942e4 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java @@ -111,14 +111,14 @@ protected void copy(LineDataSet lineDataSet) { * Returns the drawing mode for this line dataset */ @Override - public LineDataSet.Mode getMode() { + public LineDataSet.Mode getLineMode() { return mLineDataSetMode; } /** * Returns the drawing mode for this LineDataSet */ - public void setMode(LineDataSet.Mode mode) { + public void setLineMode(LineDataSet.Mode mode) { mLineDataSetMode = mode; } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java index 8b2911371..2f352ad21 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java @@ -14,7 +14,7 @@ public interface ILineDataSet extends ILineRadarDataSet { /** * Returns the drawing mode for this line dataset */ - LineDataSet.Mode getMode(); + LineDataSet.Mode getLineMode(); /** * Returns the intensity of the cubic lines (the effect intensity). diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt index 3e0e65571..b0ac67acf 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt @@ -90,7 +90,7 @@ open class LineChartRenderer( paintRender.strokeWidth = dataSet.lineWidth paintRender.setPathEffect(dataSet.dashPathEffect) - when (dataSet.mode) { + when (dataSet.lineMode) { LineDataSet.Mode.LINEAR, LineDataSet.Mode.STEPPED -> drawLinear(canvas, dataSet) LineDataSet.Mode.CUBIC_BEZIER -> drawCubicBezier(dataSet) LineDataSet.Mode.HORIZONTAL_BEZIER -> drawHorizontalBezier(dataSet) @@ -450,7 +450,7 @@ open class LineChartRenderer( private fun generateFilledPath(dataSet: ILineDataSet, startIndex: Int, endIndex: Int, outputPath: Path) { val fillMin = dataSet.fillFormatter.getFillLinePosition(dataSet, dataProvider) val phaseY = animator.phaseY - val isDrawSteppedEnabled = dataSet.mode == LineDataSet.Mode.STEPPED + val isDrawSteppedEnabled = dataSet.lineMode == LineDataSet.Mode.STEPPED val filled = outputPath filled.reset() diff --git a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt index a723d8e3c..aecc44a06 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt @@ -109,7 +109,7 @@ class CombinedChartActivity : DemoBase() { set.setCircleColor(Color.rgb(240, 238, 70)) set.circleRadius = 5f set.setFillColor(Color.rgb(240, 238, 70)) - set.mode = LineDataSet.Mode.CUBIC_BEZIER + set.lineMode = LineDataSet.Mode.CUBIC_BEZIER set.setDrawValues(true) set.valueTextSize = 10f set.setValueTextColor(Color.rgb(240, 238, 70)) diff --git a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt index 41dfab2bf..4ab0267d4 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt @@ -111,7 +111,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { // create a dataset and give it a type set1 = LineDataSet(values, "DataSet 1") - set1.mode = LineDataSet.Mode.CUBIC_BEZIER + set1.lineMode = LineDataSet.Mode.CUBIC_BEZIER set1.cubicIntensity = 0.2f set1.setDrawFilled(true) set1.setDrawCircles(false) @@ -196,7 +196,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER) + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER @@ -209,7 +209,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.STEPPED) + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED @@ -222,7 +222,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener { for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER) + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt index e3003dd73..e36dd20e8 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt @@ -202,7 +202,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec R.id.actionToggleCubic -> { binding.chart1.data?.dataSets?.forEach { val set = it as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER } binding.chart1.invalidate() } @@ -210,7 +210,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec R.id.actionToggleStepped -> { binding.chart1.data?.dataSets?.forEach { val set = it as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED } binding.chart1.invalidate() } @@ -218,7 +218,7 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec R.id.actionToggleHorizontalCubic -> { binding.chart1.data?.dataSets?.forEach { val set = it as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER } binding.chart1.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt index f25c881aa..2cb85d9ce 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt @@ -262,7 +262,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER) + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER @@ -275,7 +275,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.STEPPED) + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED @@ -288,7 +288,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER) + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER diff --git a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt index de038b26d..48a8b7031 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt @@ -206,10 +206,10 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener { for (iSet in sets) { val set = iSet as LineDataSet - if (set.mode == LineDataSet.Mode.CUBIC_BEZIER) - set.mode = LineDataSet.Mode.LINEAR + if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) + set.lineMode = LineDataSet.Mode.LINEAR else - set.mode = LineDataSet.Mode.CUBIC_BEZIER + set.lineMode = LineDataSet.Mode.CUBIC_BEZIER } chart!!.invalidate() } @@ -219,10 +219,10 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener { for (iSet in sets) { val set = iSet as LineDataSet - if (set.mode == LineDataSet.Mode.STEPPED) - set.mode = LineDataSet.Mode.LINEAR + if (set.lineMode == LineDataSet.Mode.STEPPED) + set.lineMode = LineDataSet.Mode.LINEAR else - set.mode = LineDataSet.Mode.STEPPED + set.lineMode = LineDataSet.Mode.STEPPED } chart!!.invalidate() } diff --git a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt index aa8ae4166..912731cf0 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt @@ -195,7 +195,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER) + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER @@ -208,7 +208,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.STEPPED) + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED @@ -221,7 +221,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu for (iSet in sets) { val set = iSet as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER) + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER diff --git a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt index 960477894..e7e67eeb2 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt @@ -72,7 +72,7 @@ class PerformanceLineChart : DemoBase(), OnSeekBarChangeListener { set1.setLineWidth(0.5f) set1.setDrawValues(false) set1.setDrawCircles(false) - set1.mode = LineDataSet.Mode.LINEAR + set1.lineMode = LineDataSet.Mode.LINEAR set1.setDrawFilled(false) // create a data object with the data sets diff --git a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt index 50614f425..aaf0ec902 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt @@ -171,7 +171,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener, R.id.actionToggleCubic -> { mChart!!.data?.dataSets?.forEach { val set = it as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER + set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER } mChart!!.invalidate() } @@ -179,7 +179,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener, R.id.actionToggleStepped -> { mChart!!.data?.dataSets?.forEach { val set = it as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED + set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED } mChart!!.invalidate() } @@ -187,7 +187,7 @@ class SpecificPositionsLineChartActivity : DemoBase(), OnSeekBarChangeListener, R.id.actionToggleHorizontalCubic -> { mChart!!.data?.dataSets?.forEach { val set = it as LineDataSet - set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER + set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER } mChart!!.invalidate() }