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

fix: fix for horizontal overflow started on vertical (#30)

Browse Source
This commit is contained in:
Florian Bouillon 2023-01-16 00:37:31 +01:00 committed by GitHub
parent 4cdace91ff
commit 4f5fb6fae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 85 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.gradle.kts
View File

@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:7.3.1")
classpath("com.android.tools.build:gradle:7.4.0")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@ -12,8 +12,8 @@ buildscript {
}
plugins {
id("com.android.application") version "7.3.1" apply false
id("com.android.library") version "7.3.1" apply false
id("com.android.application") version "7.4.0" apply false
id("com.android.library") version "7.4.0" apply false
id("org.jetbrains.kotlin.android") version "1.7.0" apply false
}

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

@ -42,8 +42,8 @@ sealed class BaseSerie(
for (i in 0 until entries.size) {
val it = entries[i]
if (it.x in minX..maxX) {
if (result.size == 0 && i > 0) {
result.add((entries[i - 1]))
if (result.size < 2 && i > 0) {
result.add(entries[i - 1])
}
lastIndex = i
result.add(it)

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

@ -5,6 +5,7 @@ import android.graphics.Color
import android.graphics.Paint
import android.graphics.RectF
import com.dzeio.charts.ChartView
import kotlin.math.abs
class LineSerie(
private val view: ChartView
@ -80,15 +81,91 @@ class LineSerie(
paint.color = entry.color!!
}
val doDraw = drawableSpace.contains(posX, top) ||
(
previousPosX != null &&
previousPosY != null &&
drawableSpace.contains(previousPosX, previousPosY)
) || (
previousPosX != null &&
previousPosY != null &&
posX < drawableSpace.right && (
top <= drawableSpace.top &&
previousPosY >= drawableSpace.bottom ||
top >= drawableSpace.top &&
previousPosY <= drawableSpace.bottom
)
)
// draw smol point
if (posX < drawableSpace.right) {
if (drawableSpace.contains(posX, top)) {
canvas.drawCircle(posX, top, paint.strokeWidth, paint)
}
// draw line
if (previousPosX != null && previousPosY != null) {
canvas.drawLine(previousPosX, previousPosY, posX, top, paint)
if (doDraw && previousPosY != null && previousPosX != null) {
var startX = previousPosX
var startY = previousPosY
var stopX = posX
var stopY = top
val debugPaint = Paint(linePaint)
val py = previousPosY
val px = previousPosX
val dy = abs(py - top)
val dx = abs(posX - px)
if (previousPosX < drawableSpace.left) {
val ratio = dy / dx
val dcx = abs(px)
val dcy = dcx * ratio
val ny = if (startY > stopY) py - dcy else py + dcy
startY = ny
startX = drawableSpace.left
debugPaint.color = Color.YELLOW
} else if (posX > drawableSpace.right) {
val ratio = dy / dx
val dcx = posX - drawableSpace.right
val dcy = dcx * ratio
val ny = if (py > top) top + dcy else top - dcy
stopY = ny
stopX = drawableSpace.right
debugPaint.color = Color.GRAY
}
if (
startX == previousPosX &&
(previousPosY > drawableSpace.bottom || previousPosY < drawableSpace.top)
) {
val dvb = if (top > py) top else drawableSpace.bottom - top
val ratio = dx / dy
val dcy = dy - dvb
val dcx = dcy * ratio
val nx = px + dcx
startX = nx
startY = if (top > py) drawableSpace.top else drawableSpace.bottom
debugPaint.color = Color.BLUE
}
if (top > drawableSpace.bottom) {
val ratio = dx / dy
val dcy = drawableSpace.bottom - py
val dcx = dcy * ratio
stopX = px + dcx
stopY = drawableSpace.bottom
if (startX != previousPosX) {
debugPaint.color = Color.GREEN
} else {
debugPaint.color = Color.RED
}
}
canvas.drawLine(startX, startY, stopX, stopY, if (view.debug) debugPaint else linePaint)
}
previousPosX = posX
previousPosY = top