Skip to content

Line interface change #492

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 1 commit into from
Dec 17, 2025
Merged

Line interface change #492

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
4 changes: 2 additions & 2 deletions MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public interface ILineDataSet extends ILineRadarDataSet<Entry> {
/**
* Returns the drawing mode for this line dataset
*/
LineDataSet.Mode getMode();
LineDataSet.Mode getLineMode();

/**
* Returns the intensity of the cubic lines (the effect intensity).
Expand Down
4 changes: 2 additions & 2 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 @@ -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)
Expand Down Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,23 +202,23 @@ 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()
}

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()
}

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()
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -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()
}
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/kotlin/info/appdev/chartexample/SpecificPositionsLineChartActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,23 +171,23 @@ 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()
}

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()
}

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()
}
Expand Down
Loading