dzeio/charts
1
0
Fork 0
mirror of https://github.com/dzeiocom/charts.git synced 2025-06-07 08:39:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Add global line adding

Browse Source
This commit is contained in:
Florian Bouillon 2023-01-10 17:49:51 +01:00
parent 55948edc83
commit e3d82026db
3 changed files with 74 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/src/main/java/com/dzeio/charts/axis/Line.kt Normal file
View File

@ -0,0 +1,15 @@
package com.dzeio.charts.axis
import android.graphics.Paint
data class Line (
/**
* is the bar dotted
*/
var dotted: Boolean = false,
/**
* Custom Paint
*/
var paint: Paint? = null
)

48
library/src/main/java/com/dzeio/charts/axis/YAxis.kt
View File

@ -40,7 +40,12 @@ class YAxis(
private var min: Float? = 0f
private var max: Float? = null
override var drawZeroLine: Boolean = true
@Deprecated("use the new global function", replaceWith = ReplaceWith("YAxisInterface.addLine"))
override var drawZeroLine: Boolean = false
set(value) {
addLine(0f, Line())
field = value
}
override var scrollEnabled: Boolean = false
@ -61,7 +66,7 @@ class YAxis(
return max!!
}
if (view.series.isEmpty()) {
return (this.goalLine ?: 90f) + 10f
return this.lines.keys.maxOrNull() ?: 0f
}
val seriesMax = view.series
.maxOf { serie ->
@ -70,9 +75,6 @@ class YAxis(
}
return@maxOf serie.getDisplayedEntries().maxOf { entry -> entry.y }
}
if (this.goalLine != null) {
return if (seriesMax > this.goalLine!!) seriesMax else this.goalLine!! + 1000f
}
return seriesMax
}
@ -81,7 +83,7 @@ class YAxis(
return min!!
}
if (view.series.isEmpty()) {
return this.goalLine ?: 0f
return this.lines.keys.minOrNull() ?: 0f
}
return view.series
.minOf { serie ->
@ -122,21 +124,26 @@ class YAxis(
}
if (this.goalLine != null) {
val pos = (1 - this.goalLine!! / max) * space.height() + space.top
for ((y, settings) in lines) {
val pos = ((1 - y - min / (getYMax() - min)) * space.height() + space.top)
if (settings.dotted) {
canvas.drawDottedLine(
0f,
pos,
space.right - maxWidth - 32f,
pos,
space.right / 20,
goalLinePaint
settings.paint ?: linePaint
)
} else {
canvas.drawLine(
0f,
pos,
space.right - maxWidth - 32f,
pos,
settings.paint ?: linePaint
)
}
if (this.drawZeroLine) {
val pos = ((1 - -min / (getYMax() - min)) * space.height() + space.top)
canvas.drawLine(0f, pos, space.right - maxWidth - 32f, pos, linePaint)
}
return maxWidth + 32f
@ -146,9 +153,20 @@ class YAxis(
// TODO("Not yet implemented")
}
private var goalLine: Float? = null
private val lines: HashMap<Float, Line> = hashMapOf()
override fun addLine(y: Float, line: Line) {
lines[y] = line
}
override fun removeLine(y: Float) {
lines.remove(y)
}
@Deprecated("use the new global function", ReplaceWith("YAxisInterface.addLine"))
override fun setGoalLine(height: Float?) {
goalLine = height
if (height != null) {
addLine(height, Line(true))
}
}
}

18
library/src/main/java/com/dzeio/charts/axis/YAxisInterface.kt
View File

@ -41,6 +41,7 @@ sealed interface YAxisInterface {
/**
* do the Zero line gets drawn?
*/
@Deprecated("use the new global function", ReplaceWith("YAxisInterface.addLine"))
var drawZeroLine: Boolean
/**
@ -90,6 +91,23 @@ sealed interface YAxisInterface {
/**
* Add a Goal line
*
*/
@Deprecated("use the new global function", ReplaceWith("YAxisInterface.addLine"))
fun setGoalLine(height: Float?)
/**
* add a line on the Chart
*
* @param y the Y position of the line
* @param paint the Paint of the line if you want to have a custom one
*/
fun addLine(y: Float, line: Line)
/**
* remove a line one the specified position
*
* @param y the Y position of the line
*/
fun removeLine(y: Float)
}