Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ class MultiLineChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartGestu
val sampleValues = getValues(100)

for (i in 0..<progress) {
val valuesY = ((sampleValues[i]!!.toFloat() * binding.seekBarY.progress) + 3).toDouble()
values.add(Entry(i.toFloat(), valuesY.toFloat()))
val valuesY = (sampleValues[i]!!.toFloat() * binding.seekBarY.progress) + 3
values.add(Entry(i.toFloat(), valuesY))
}

val lineDataSet = LineDataSet(values, "DataSet " + (datasetNumber + 1))
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package info.appdev.charting.animation

import android.animation.TimeInterpolator
import androidx.annotation.RequiresApi
import kotlin.math.asin
import kotlin.math.cos
import kotlin.math.pow
Expand All @@ -11,7 +10,6 @@ import kotlin.math.sqrt
/**
* Easing options.
*/
@RequiresApi(11)
object Easing {
private const val DOUBLE_PI = 2f * Math.PI.toFloat()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt

protected open fun prepareValuePxMatrix() {
if (isLogEnabled) {
Timber.i("Preparing Value-Px Matrix, xMin: " + mXAxis.mAxisMinimum + ", xMax: " + mXAxis.mAxisMaximum + ", xDelta: " + mXAxis.mAxisRange)
Timber.i("Preparing Value-Px Matrix, xMin: ${mXAxis.mAxisMinimum}, xMax: ${mXAxis.mAxisMaximum}, xDelta: ${mXAxis.mAxisRange}")
}

mRightAxisTransformer.prepareMatrixValuePx(mXAxis.mAxisMinimum, mXAxis.mAxisRange, mAxisRight.mAxisRange, this.mAxisRight.mAxisMinimum)
Expand Down Expand Up @@ -522,7 +522,7 @@ abstract class BarLineChartBase<T : BarLineScatterCandleBubbleData<IBarLineScatt

if (isLogEnabled) {
Timber.i("offsetLeft: $offsetLeft, offsetTop: $offsetTop, offsetRight: $offsetRight, offsetBottom: $offsetBottom")
Timber.i("Content: " + viewPortHandler.contentRect)
Timber.i("Content: ${viewPortHandler.contentRect}")
}
}

Expand Down
14 changes: 8 additions & 6 deletions chartLib/src/main/kotlin/info/appdev/charting/charts/PieChart.kt
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ open class PieChart : PieRadarChartBase<PieData> {
var diff = 0f

for (i in 0..<data.dataSetCount) {
val set = dataSets!!.get(i)
val set = dataSets!![i]

for (j in 0..<set.entryCount) {
val drawAngle = calcAngle(abs(set.getEntryForIndex(j)!!.y), yValueSum)
Expand Down Expand Up @@ -554,12 +554,14 @@ open class PieChart : PieRadarChartBase<PieData> {
* @param maxAngle min 90, max 360
*/
set(value) {
var maxangle = value
if (maxangle > 360) maxangle = 360f
var maxAngle = value
if (maxAngle > 360)
maxAngle = 360f

if (maxangle < 90) maxangle = 90f
if (maxAngle < 90)
maxAngle = 90f

this.mMaxAngle = maxangle
this.mMaxAngle = maxAngle
}

var minAngleForSlices: Float
Expand All @@ -574,7 +576,7 @@ open class PieChart : PieRadarChartBase<PieData> {
* and [.invalidate] when changing this, only works if there is enough room for all
* slices to have the minimum angle.
*
* @param minAngle minimum 0, maximum is half of [.setMaxAngle]
* minimum 0, maximum is half of [.setMaxAngle]
*/
set(minAngle) {
var minAngle = minAngle
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,13 @@ open class BubbleChartRenderer(
private val pointBuffer = FloatArray(2)

protected fun getShapeSize(entrySize: Float, maxSize: Float, reference: Float, normalizeSize: Boolean): Float {
val factor = if (normalizeSize) (if (maxSize == 0f) 1f else sqrt((entrySize / maxSize).toDouble()).toFloat()) else entrySize
val factor = if (normalizeSize)
(if (maxSize == 0f)
1f
else
sqrt((entrySize / maxSize).toDouble()).toFloat())
else
entrySize
val shapeSize = reference * factor
return shapeSize
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,10 +341,10 @@ open class LineChartRenderer(
canvas!!.drawLines(lineBuffer, 0, pointsPerEntryPair * 2, paintRender)
}
} else { // only one color per dataset

if (lineBuffer.size < max(((entryCount) * pointsPerEntryPair).toDouble(), pointsPerEntryPair.toDouble()) * 2) lineBuffer = FloatArray(
(max(((entryCount) * pointsPerEntryPair).toDouble(), pointsPerEntryPair.toDouble()) * 4).toInt()
)
if (lineBuffer.size < max(((entryCount) * pointsPerEntryPair).toDouble(), pointsPerEntryPair.toDouble()) * 2)
lineBuffer = FloatArray(
(max(((entryCount) * pointsPerEntryPair).toDouble(), pointsPerEntryPair.toDouble()) * 4).toInt()
)

var e1: Entry?
var e2: Entry?
Expand Down
Loading