Skip to content

Commit 7dc3b14

Browse files
authored
Merge pull request #613 from AppDevNext/CleanupDatasets
Cleanup datasets
2 parents 674934e + fa1a764 commit 7dc3b14

File tree

9 files changed

+4
-43
lines changed

9 files changed

+4
-43
lines changed

chartLib/src/main/kotlin/info/appdev/charting/data/BarDataSet.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ open class BarDataSet(yVals: MutableList<BarEntry>, label: String) : BarLineScat
177177
* The width used for drawing borders around the bars.
178178
* If borderWidth == 0, no border will be drawn.
179179
*/
180-
override var barBorderWidth: kotlin.Float
180+
override var barBorderWidth: Float
181181
get() = mBarBorderWidth
182182
set(value) {
183183
mBarBorderWidth = value

chartLib/src/main/kotlin/info/appdev/charting/data/BubbleData.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ import info.appdev.charting.interfaces.datasets.IBubbleDataSet
55
class BubbleData : BarLineScatterCandleBubbleData<IBubbleDataSet> {
66
constructor() : super()
77

8-
constructor(vararg dataSets: IBubbleDataSet) : super(*dataSets)
9-
108
constructor(dataSets: MutableList<IBubbleDataSet>) : super(dataSets)
119

12-
1310
/**
1411
* Sets the width of the circle that surrounds the bubble when highlighted
1512
* for all DataSet objects this data object contains, in dp.

chartLib/src/main/kotlin/info/appdev/charting/data/BubbleEntry.kt

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ class BubbleEntry : Entry {
1212
/**
1313
* Returns the size of this entry (the size of the bubble).
1414
*/
15-
/** size value */
1615
var size: Float
1716

1817
/**
@@ -50,19 +49,6 @@ class BubbleEntry : Entry {
5049
this.size = size
5150
}
5251

53-
/**
54-
* Constructor.
55-
*
56-
* @param x The value on the x-axis.
57-
* @param y The value on the y-axis.
58-
* @param size The size of the bubble.
59-
* @param icon Icon image
60-
* @param data Spot for additional data this Entry represents.
61-
*/
62-
constructor(x: Float, y: Float, size: Float, icon: Drawable?, data: Any?) : super(x, y, icon, data) {
63-
this.size = size
64-
}
65-
6652
override fun copy(): BubbleEntry {
6753
return BubbleEntry(x, y, this.size, data)
6854
}

chartLib/src/main/kotlin/info/appdev/charting/data/CandleData.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,5 @@ import info.appdev.charting.interfaces.datasets.ICandleDataSet
55
class CandleData : BarLineScatterCandleBubbleData<ICandleDataSet> {
66
constructor() : super()
77

8-
constructor(dataSets: MutableList<ICandleDataSet>) : super(dataSets)
9-
108
constructor(vararg dataSets: ICandleDataSet) : super(*dataSets)
119
}

chartLib/src/main/kotlin/info/appdev/charting/data/CandleEntry.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,21 @@ class CandleEntry : Entry {
1212
/**
1313
* Returns the upper shadows highest value.
1414
*/
15-
/** shadow-high value */
1615
var high: Float
1716

1817
/**
1918
* Returns the lower shadows lowest value.
2019
*/
21-
/** shadow-low value */
2220
var low: Float
2321

2422
/**
2523
* Returns the bodies close value.
2624
*/
27-
/** close value */
2825
var close: Float
2926

3027
/**
3128
* Returns the bodies open value.
3229
*/
33-
/** open value */
3430
var open: Float
3531

3632
/**
@@ -105,8 +101,7 @@ class CandleEntry : Entry {
105101
}
106102

107103
/**
108-
* Returns the overall range (difference) between shadow-high and
109-
* shadow-low.
104+
* Returns the overall range (difference) between shadow-high and shadow-low.
110105
*/
111106
val shadowRange: Float
112107
get() = abs(this.high - this.low)

chartLib/src/main/kotlin/info/appdev/charting/data/PieData.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import timber.log.Timber
1111
* PieDataSet (multiple PieDataSets inside a single PieChart are not possible).
1212
*/
1313
class PieData : ChartData<IPieDataSet> {
14-
constructor() : super()
1514

1615
constructor(dataSet: IPieDataSet) : super(dataSet)
1716

chartLib/src/main/kotlin/info/appdev/charting/data/PieDataSet.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ open class PieDataSet(yVals: MutableList<PieEntry>?, label: String) : DataSet<Pi
4646
}
4747

4848
/**
49-
* Sets the space that is left out between the piechart-slices in dp.
49+
* Sets the space that is left out between the PieChart-slices in dp.
5050
* Default: 0 --> no space, maximum 20f
5151
*/
5252
override var sliceSpace: Float
@@ -70,7 +70,7 @@ open class PieDataSet(yVals: MutableList<PieEntry>?, label: String) : DataSet<Pi
7070
}
7171

7272
/**
73-
* sets the distance the highlighted piechart-slice of this DataSet is
73+
* sets the distance the highlighted PieChart-slice of this DataSet is
7474
* "shifted" away from the center of the chart, default 12f
7575
*/
7676
override var selectionShift: Float

chartLib/src/main/kotlin/info/appdev/charting/data/RadarData.kt

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,11 @@ import info.appdev.charting.interfaces.datasets.IRadarDataSet
99
class RadarData : ChartData<IRadarDataSet> {
1010
/**
1111
* Sets the labels that should be drawn around the RadarChart at the end of each web line.
12-
*
13-
* @param labels
1412
*/
1513
var labels: MutableList<String>? = null
1614

17-
constructor() : super()
18-
1915
constructor(dataSets: MutableList<IRadarDataSet>) : super(dataSets)
2016

21-
constructor(vararg dataSets: IRadarDataSet) : super(*dataSets)
22-
23-
/**
24-
* Sets the labels that should be drawn around the RadarChart at the end of each web line.
25-
*/
26-
fun setLabels(vararg labels: String) {
27-
this.labels = mutableListOf(*labels)
28-
}
29-
3017
override fun getEntryForHighlight(highlight: Highlight): Entry? {
3118
return getDataSetByIndex(highlight.dataSetIndex)!!.getEntryForIndex(highlight.x.toInt())
3219
}

chartLib/src/main/kotlin/info/appdev/charting/renderer/RadarChartRenderer.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ open class RadarChartRenderer(
3030
private val innerAreaPath = Path()
3131
private val tempPath = Path()
3232

33-
3433
override fun initBuffers() = Unit
3534

3635
override fun drawData(canvas: Canvas) {

0 commit comments

Comments
 (0)