Skip to content

Commit ac5ff06

Browse files
hannesa2hannesa2
authored
Merge pull request #492 from AppDevNext/LineInterfaceChange
Line interface change
2 parents 4f5395a + b42b7e0 commit ac5ff06

File tree

11 files changed

+29
-29
lines changed

11 files changed

+29
-29
lines changed

‎MPChartLib/src/main/java/com/github/mikephil/charting/data/LineDataSet.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,14 @@ protected void copy(LineDataSet lineDataSet) {
111111
* Returns the drawing mode for this line dataset
112112
*/
113113
@Override
114-
public LineDataSet.Mode getMode() {
114+
public LineDataSet.Mode getLineMode() {
115115
return mLineDataSetMode;
116116
}
117117

118118
/**
119119
* Returns the drawing mode for this LineDataSet
120120
*/
121-
public void setMode(LineDataSet.Mode mode) {
121+
public void setLineMode(LineDataSet.Mode mode) {
122122
mLineDataSetMode = mode;
123123
}
124124

‎MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/ILineDataSet.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public interface ILineDataSet extends ILineRadarDataSet<Entry> {
1414
/**
1515
* Returns the drawing mode for this line dataset
1616
*/
17-
LineDataSet.Mode getMode();
17+
LineDataSet.Mode getLineMode();
1818

1919
/**
2020
* Returns the intensity of the cubic lines (the effect intensity).

‎MPChartLib/src/main/java/com/github/mikephil/charting/renderer/LineChartRenderer.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ open class LineChartRenderer(
9090
paintRender.strokeWidth = dataSet.lineWidth
9191
paintRender.setPathEffect(dataSet.dashPathEffect)
9292

93-
when (dataSet.mode) {
93+
when (dataSet.lineMode) {
9494
LineDataSet.Mode.LINEAR, LineDataSet.Mode.STEPPED -> drawLinear(canvas, dataSet)
9595
LineDataSet.Mode.CUBIC_BEZIER -> drawCubicBezier(dataSet)
9696
LineDataSet.Mode.HORIZONTAL_BEZIER -> drawHorizontalBezier(dataSet)
@@ -450,7 +450,7 @@ open class LineChartRenderer(
450450
private fun generateFilledPath(dataSet: ILineDataSet, startIndex: Int, endIndex: Int, outputPath: Path) {
451451
val fillMin = dataSet.fillFormatter.getFillLinePosition(dataSet, dataProvider)
452452
val phaseY = animator.phaseY
453-
val isDrawSteppedEnabled = dataSet.mode == LineDataSet.Mode.STEPPED
453+
val isDrawSteppedEnabled = dataSet.lineMode == LineDataSet.Mode.STEPPED
454454

455455
val filled = outputPath
456456
filled.reset()

‎app/src/main/kotlin/info/appdev/chartexample/CombinedChartActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ class CombinedChartActivity : DemoBase() {
109109
set.setCircleColor(Color.rgb(240, 238, 70))
110110
set.circleRadius = 5f
111111
set.setFillColor(Color.rgb(240, 238, 70))
112-
set.mode = LineDataSet.Mode.CUBIC_BEZIER
112+
set.lineMode = LineDataSet.Mode.CUBIC_BEZIER
113113
set.setDrawValues(true)
114114
set.valueTextSize = 10f
115115
set.setValueTextColor(Color.rgb(240, 238, 70))

‎app/src/main/kotlin/info/appdev/chartexample/CubicLineChartActivity.kt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
111111
// create a dataset and give it a type
112112
set1 = LineDataSet(values, "DataSet 1")
113113

114-
set1.mode = LineDataSet.Mode.CUBIC_BEZIER
114+
set1.lineMode = LineDataSet.Mode.CUBIC_BEZIER
115115
set1.cubicIntensity = 0.2f
116116
set1.setDrawFilled(true)
117117
set1.setDrawCircles(false)
@@ -196,7 +196,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
196196

197197
for (iSet in sets) {
198198
val set = iSet as LineDataSet
199-
set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER)
199+
set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER)
200200
LineDataSet.Mode.LINEAR
201201
else
202202
LineDataSet.Mode.CUBIC_BEZIER
@@ -209,7 +209,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
209209

210210
for (iSet in sets) {
211211
val set = iSet as LineDataSet
212-
set.mode = if (set.mode == LineDataSet.Mode.STEPPED)
212+
set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED)
213213
LineDataSet.Mode.LINEAR
214214
else
215215
LineDataSet.Mode.STEPPED
@@ -222,7 +222,7 @@ class CubicLineChartActivity : DemoBase(), OnSeekBarChangeListener {
222222

223223
for (iSet in sets) {
224224
val set = iSet as LineDataSet
225-
set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER)
225+
set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER)
226226
LineDataSet.Mode.LINEAR
227227
else
228228
LineDataSet.Mode.HORIZONTAL_BEZIER

‎app/src/main/kotlin/info/appdev/chartexample/LineChartActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,23 +202,23 @@ class LineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelec
202202
R.id.actionToggleCubic -> {
203203
binding.chart1.data?.dataSets?.forEach {
204204
val set = it as LineDataSet
205-
set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER
205+
set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.CUBIC_BEZIER
206206
}
207207
binding.chart1.invalidate()
208208
}
209209

210210
R.id.actionToggleStepped -> {
211211
binding.chart1.data?.dataSets?.forEach {
212212
val set = it as LineDataSet
213-
set.mode = if (set.mode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED
213+
set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED) LineDataSet.Mode.LINEAR else LineDataSet.Mode.STEPPED
214214
}
215215
binding.chart1.invalidate()
216216
}
217217

218218
R.id.actionToggleHorizontalCubic -> {
219219
binding.chart1.data?.dataSets?.forEach {
220220
val set = it as LineDataSet
221-
set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER
221+
set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER) LineDataSet.Mode.LINEAR else LineDataSet.Mode.HORIZONTAL_BEZIER
222222
}
223223
binding.chart1.invalidate()
224224
}

‎app/src/main/kotlin/info/appdev/chartexample/LineChartDualAxisActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
262262

263263
for (iSet in sets) {
264264
val set = iSet as LineDataSet
265-
set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER)
265+
set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER)
266266
LineDataSet.Mode.LINEAR
267267
else
268268
LineDataSet.Mode.CUBIC_BEZIER
@@ -275,7 +275,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
275275

276276
for (iSet in sets) {
277277
val set = iSet as LineDataSet
278-
set.mode = if (set.mode == LineDataSet.Mode.STEPPED)
278+
set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED)
279279
LineDataSet.Mode.LINEAR
280280
else
281281
LineDataSet.Mode.STEPPED
@@ -288,7 +288,7 @@ class LineChartDualAxisActivity : DemoBase(), OnSeekBarChangeListener, OnChartVa
288288

289289
for (iSet in sets) {
290290
val set = iSet as LineDataSet
291-
set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER)
291+
set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER)
292292
LineDataSet.Mode.LINEAR
293293
else
294294
LineDataSet.Mode.HORIZONTAL_BEZIER

‎app/src/main/kotlin/info/appdev/chartexample/LineChartTimeActivity.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,10 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
206206

207207
for (iSet in sets) {
208208
val set = iSet as LineDataSet
209-
if (set.mode == LineDataSet.Mode.CUBIC_BEZIER)
210-
set.mode = LineDataSet.Mode.LINEAR
209+
if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER)
210+
set.lineMode = LineDataSet.Mode.LINEAR
211211
else
212-
set.mode = LineDataSet.Mode.CUBIC_BEZIER
212+
set.lineMode = LineDataSet.Mode.CUBIC_BEZIER
213213
}
214214
chart!!.invalidate()
215215
}
@@ -219,10 +219,10 @@ class LineChartTimeActivity : DemoBase(), OnSeekBarChangeListener {
219219

220220
for (iSet in sets) {
221221
val set = iSet as LineDataSet
222-
if (set.mode == LineDataSet.Mode.STEPPED)
223-
set.mode = LineDataSet.Mode.LINEAR
222+
if (set.lineMode == LineDataSet.Mode.STEPPED)
223+
set.lineMode = LineDataSet.Mode.LINEAR
224224
else
225-
set.mode = LineDataSet.Mode.STEPPED
225+
set.lineMode = LineDataSet.Mode.STEPPED
226226
}
227227
chart!!.invalidate()
228228
}

‎app/src/main/kotlin/info/appdev/chartexample/MultiLineChartActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
195195

196196
for (iSet in sets) {
197197
val set = iSet as LineDataSet
198-
set.mode = if (set.mode == LineDataSet.Mode.CUBIC_BEZIER)
198+
set.lineMode = if (set.lineMode == LineDataSet.Mode.CUBIC_BEZIER)
199199
LineDataSet.Mode.LINEAR
200200
else
201201
LineDataSet.Mode.CUBIC_BEZIER
@@ -208,7 +208,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
208208

209209
for (iSet in sets) {
210210
val set = iSet as LineDataSet
211-
set.mode = if (set.mode == LineDataSet.Mode.STEPPED)
211+
set.lineMode = if (set.lineMode == LineDataSet.Mode.STEPPED)
212212
LineDataSet.Mode.LINEAR
213213
else
214214
LineDataSet.Mode.STEPPED
@@ -221,7 +221,7 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
221221

222222
for (iSet in sets) {
223223
val set = iSet as LineDataSet
224-
set.mode = if (set.mode == LineDataSet.Mode.HORIZONTAL_BEZIER)
224+
set.lineMode = if (set.lineMode == LineDataSet.Mode.HORIZONTAL_BEZIER)
225225
LineDataSet.Mode.LINEAR
226226
else
227227
LineDataSet.Mode.HORIZONTAL_BEZIER

‎app/src/main/kotlin/info/appdev/chartexample/PerformanceLineChart.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class PerformanceLineChart : DemoBase(), OnSeekBarChangeListener {
7272
set1.setLineWidth(0.5f)
7373
set1.setDrawValues(false)
7474
set1.setDrawCircles(false)
75-
set1.mode = LineDataSet.Mode.LINEAR
75+
set1.lineMode = LineDataSet.Mode.LINEAR
7676
set1.setDrawFilled(false)
7777

7878
// create a data object with the data sets

0 commit comments

Comments
 (0)