From fa1a76445f1fc71610e2263690c3d27080d1abe7 Mon Sep 17 00:00:00 2001 From: Hannes Achleitner Date: Mon, 29 Dec 2025 09:55:53 +0100 Subject: [PATCH] Cleanup datasets --- .../kotlin/info/appdev/charting/data/BarDataSet.kt | 2 +- .../kotlin/info/appdev/charting/data/BubbleData.kt | 3 --- .../info/appdev/charting/data/BubbleEntry.kt | 14 -------------- .../kotlin/info/appdev/charting/data/CandleData.kt | 2 -- .../info/appdev/charting/data/CandleEntry.kt | 7 +------ .../kotlin/info/appdev/charting/data/PieData.kt | 1 - .../kotlin/info/appdev/charting/data/PieDataSet.kt | 4 ++-- .../kotlin/info/appdev/charting/data/RadarData.kt | 13 ------------- .../appdev/charting/renderer/RadarChartRenderer.kt | 1 - 9 files changed, 4 insertions(+), 43 deletions(-) diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/BarDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BarDataSet.kt index e02b9d132..3e02c9bde 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/data/BarDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BarDataSet.kt @@ -177,7 +177,7 @@ open class BarDataSet(yVals: MutableList, label: String) : BarLineScat * The width used for drawing borders around the bars. * If borderWidth == 0, no border will be drawn. */ - override var barBorderWidth: kotlin.Float + override var barBorderWidth: Float get() = mBarBorderWidth set(value) { mBarBorderWidth = value diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt index 500f59946..9b1e66e2c 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt @@ -5,11 +5,8 @@ import info.appdev.charting.interfaces.datasets.IBubbleDataSet class BubbleData : BarLineScatterCandleBubbleData { constructor() : super() - constructor(vararg dataSets: IBubbleDataSet) : super(*dataSets) - constructor(dataSets: MutableList) : super(dataSets) - /** * Sets the width of the circle that surrounds the bubble when highlighted * for all DataSet objects this data object contains, in dp. diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleEntry.kt index aec75f004..0ea928773 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/BubbleEntry.kt @@ -12,7 +12,6 @@ class BubbleEntry : Entry { /** * Returns the size of this entry (the size of the bubble). */ - /** size value */ var size: Float /** @@ -50,19 +49,6 @@ class BubbleEntry : Entry { this.size = size } - /** - * Constructor. - * - * @param x The value on the x-axis. - * @param y The value on the y-axis. - * @param size The size of the bubble. - * @param icon Icon image - * @param data Spot for additional data this Entry represents. - */ - constructor(x: Float, y: Float, size: Float, icon: Drawable?, data: Any?) : super(x, y, icon, data) { - this.size = size - } - override fun copy(): BubbleEntry { return BubbleEntry(x, y, this.size, data) } diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/CandleData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleData.kt index 8cc649cff..01bc47201 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/data/CandleData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleData.kt @@ -5,7 +5,5 @@ import info.appdev.charting.interfaces.datasets.ICandleDataSet class CandleData : BarLineScatterCandleBubbleData { constructor() : super() - constructor(dataSets: MutableList) : super(dataSets) - constructor(vararg dataSets: ICandleDataSet) : super(*dataSets) } diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/CandleEntry.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleEntry.kt index 64869da68..82c07b47c 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/data/CandleEntry.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/CandleEntry.kt @@ -12,25 +12,21 @@ class CandleEntry : Entry { /** * Returns the upper shadows highest value. */ - /** shadow-high value */ var high: Float /** * Returns the lower shadows lowest value. */ - /** shadow-low value */ var low: Float /** * Returns the bodies close value. */ - /** close value */ var close: Float /** * Returns the bodies open value. */ - /** open value */ var open: Float /** @@ -105,8 +101,7 @@ class CandleEntry : Entry { } /** - * Returns the overall range (difference) between shadow-high and - * shadow-low. + * Returns the overall range (difference) between shadow-high and shadow-low. */ val shadowRange: Float get() = abs(this.high - this.low) diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/PieData.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/PieData.kt index 7e9ec6712..f315aaf4b 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/data/PieData.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/PieData.kt @@ -11,7 +11,6 @@ import timber.log.Timber * PieDataSet (multiple PieDataSets inside a single PieChart are not possible). */ class PieData : ChartData { - constructor() : super() constructor(dataSet: IPieDataSet) : super(dataSet) diff --git a/chartLib/src/main/kotlin/info/appdev/charting/data/PieDataSet.kt b/chartLib/src/main/kotlin/info/appdev/charting/data/PieDataSet.kt index e50d94cda..bc33c6a30 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/data/PieDataSet.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/data/PieDataSet.kt @@ -46,7 +46,7 @@ open class PieDataSet(yVals: MutableList?, label: String) : DataSet no space, maximum 20f */ override var sliceSpace: Float @@ -70,7 +70,7 @@ open class PieDataSet(yVals: MutableList?, label: String) : DataSet { /** * Sets the labels that should be drawn around the RadarChart at the end of each web line. - * - * @param labels */ var labels: MutableList? = null - constructor() : super() - constructor(dataSets: MutableList) : super(dataSets) - constructor(vararg dataSets: IRadarDataSet) : super(*dataSets) - - /** - * Sets the labels that should be drawn around the RadarChart at the end of each web line. - */ - fun setLabels(vararg labels: String) { - this.labels = mutableListOf(*labels) - } - override fun getEntryForHighlight(highlight: Highlight): Entry? { return getDataSetByIndex(highlight.dataSetIndex)!!.getEntryForIndex(highlight.x.toInt()) } diff --git a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt index b72f6e5a7..d153a9c30 100644 --- a/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt +++ b/chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt @@ -30,7 +30,6 @@ open class RadarChartRenderer( private val innerAreaPath = Path() private val tempPath = Path() - override fun initBuffers() = Unit override fun drawData(canvas: Canvas) {