dzeio/charts
1
0
Fork 0
mirror of https://github.com/dzeiocom/charts.git synced 2025-04-22 10:42:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: include lines in auto Y calculation (#48)

Browse Source
This commit is contained in:
Florian Bouillon 2023-01-29 16:41:39 +01:00 committed by GitHub
parent 542e3afd12
commit fe20f90654
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,9 +68,13 @@ class YAxis(
if (max != null) { if (max != null) {
return max!! return max!!
} }
val max = this.lines.keys.maxOrNull() ?: 0f
if (view.series.isEmpty()) { if (view.series.isEmpty()) {
return this.lines.keys.maxOrNull() ?: 0f return max
} }
if (view.type == ChartType.STACKED) { if (view.type == ChartType.STACKED) {
val nList: ArrayList<Float> = arrayListOf() val nList: ArrayList<Float> = arrayListOf()
@ -91,7 +95,8 @@ class YAxis(
} }
} }
return nList.maxOf { it } val localMax = nList.maxOf { it }
return if (localMax > max) localMax else max
} }
val seriesMax = view.series val seriesMax = view.series
.maxOf { serie -> .maxOf { serie ->
@ -100,16 +105,20 @@ class YAxis(
} }
return@maxOf serie.getDisplayedEntries().maxOf { entry -> entry.y } return@maxOf serie.getDisplayedEntries().maxOf { entry -> entry.y }
} }
return seriesMax return if (seriesMax > max) seriesMax else max
} }
override fun getYMin(): Float { override fun getYMin(): Float {
if (min != null) { if (min != null) {
return min!! return min!!
} }
val min = this.lines.keys.minOrNull() ?: 0f
if (view.series.isEmpty()) { if (view.series.isEmpty()) {
return this.lines.keys.minOrNull() ?: 0f return min
} }
if (view.type == ChartType.STACKED) { if (view.type == ChartType.STACKED) {
val nList: ArrayList<Float> = arrayListOf() val nList: ArrayList<Float> = arrayListOf()
@ -130,15 +139,18 @@ class YAxis(
} }
} }
return nList.minOf { it } val localMin = nList.minOf { it }
return if (localMin < min) localMin else min
} }
return view.series val localMin = view.series
.minOf { serie -> .minOf { serie ->
if (serie.getDisplayedEntries().isEmpty()) { if (serie.getDisplayedEntries().isEmpty()) {
return@minOf 0f return@minOf 0f
} }
return@minOf serie.getDisplayedEntries().minOf { entry -> entry.y } return@minOf serie.getDisplayedEntries().minOf { entry -> entry.y }
} }
return if (localMin < min) localMin else min
} }
override fun onDraw(canvas: Canvas, space: RectF): Float { override fun onDraw(canvas: Canvas, space: RectF): Float {
@ -153,6 +165,12 @@ class YAxis(
val valueIncrement = max / (labelCount - 1) val valueIncrement = max / (labelCount - 1)
for (index in 0 until labelCount) { for (index in 0 until labelCount) {
val value = min + (valueIncrement * index) val value = min + (valueIncrement * index)
// Ignore line if there is already one on the exact same point
if (lines.containsKey(value)) {
continue
}
val text = onValueFormat(min + (valueIncrement * index)) val text = onValueFormat(min + (valueIncrement * index))
textLabel.getTextBounds(text, 0, text.length, rect) textLabel.getTextBounds(text, 0, text.length, rect)
maxWidth = maxWidth.coerceAtLeast(rect.width().toFloat()) maxWidth = maxWidth.coerceAtLeast(rect.width().toFloat())