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

fix: grouped barchart not displaying second bar if y is the same (#28)

Browse Source
This commit is contained in:
Florian Bouillon 2023-01-12 23:27:16 +01:00 committed by GitHub
parent 4612fd7189
commit 890d474ab4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/src/main/java/com/dzeio/charts/Entry.kt
View File

@ -1,10 +1,13 @@
package com.dzeio.charts package com.dzeio.charts
import com.dzeio.charts.series.SerieInterface
/** /**
* A Base entry for any charts * A Base entry for any charts
*/ */
data class Entry( data class Entry(
var x: Double, var x: Double,
var y: Float, var y: Float,
var color: Int? = null var color: Int? = null,
var serie: SerieInterface? = null
) )

2
library/src/main/java/com/dzeio/charts/axis/XAxis.kt
View File

@ -52,7 +52,7 @@ class XAxis(
} }
override fun getPositionOnRect(entry: Entry, drawableSpace: RectF): Double { override fun getPositionOnRect(entry: Entry, drawableSpace: RectF): Double {
val result = drawableSpace.width() * (entry.x - x) / getDataWidth() val result = drawableSpace.left + drawableSpace.width() * (entry.x - x) / getDataWidth()
if (view.type == ChartType.GROUPED) { if (view.type == ChartType.GROUPED) {
val serie = view.series.find { it.entries.contains(entry) } val serie = view.series.find { it.entries.contains(entry) }
val index = view.series.indexOf(serie) val index = view.series.indexOf(serie)

2
library/src/main/java/com/dzeio/charts/series/BarSerie.kt
View File

@ -65,7 +65,7 @@ class BarSerie(
// calculated height in percent from 0 to 100 // calculated height in percent from 0 to 100
var top = view.yAxis.getPositionOnRect(entry, drawableSpace) var top = view.yAxis.getPositionOnRect(entry, drawableSpace)
.coerceIn(drawableSpace.top, drawableSpace.bottom) .coerceIn(drawableSpace.top, drawableSpace.bottom)
var posX = drawableSpace.left + view.xAxis.getPositionOnRect( var posX = view.xAxis.getPositionOnRect(
entry, entry,
drawableSpace drawableSpace
).toFloat() ).toFloat()

6
library/src/main/java/com/dzeio/charts/series/BaseSerie.kt
View File

@ -25,6 +25,12 @@ sealed class BaseSerie(
override var yAxisPosition: YAxisPosition = YAxisPosition.RIGHT override var yAxisPosition: YAxisPosition = YAxisPosition.RIGHT
override var entries: ArrayList<Entry> = arrayListOf() override var entries: ArrayList<Entry> = arrayListOf()
set(values) {
for (value in values) {
value.serie = this
}
field = values
}
override fun getDisplayedEntries(): ArrayList<Entry> { override fun getDisplayedEntries(): ArrayList<Entry> {
val minX = view.xAxis.x val minX = view.xAxis.x

7
library/src/main/java/com/dzeio/charts/series/LineSerie.kt
View File

@ -68,9 +68,10 @@ class LineSerie(
entriesCurrentY[entry.x]!!.value = top entriesCurrentY[entry.x]!!.value = top
} }
val posX = (drawableSpace.left + val posX = (
view.xAxis.getPositionOnRect(entry, drawableSpace) + view.xAxis.getPositionOnRect(entry, drawableSpace) +
view.xAxis.getEntryWidth(drawableSpace) / 2f).toFloat() view.xAxis.getEntryWidth(drawableSpace) / 2f
).toFloat()
// handle color recoloration // handle color recoloration
val paint = Paint(linePaint) val paint = Paint(linePaint)