diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarDataSet.kt index 9d90a7df2c..92d5dd400c 100644 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarDataSet.kt +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/data/RadarDataSet.kt @@ -19,41 +19,41 @@ open class RadarDataSet(yVals: MutableList?, label: String = "") : L protected var mHighlightCircleOuterRadius: Float = 4.0f protected var mHighlightCircleStrokeWidth: Float = 2.0f - /** Returns true if highlight circle should be drawn, false if not */ - override fun isDrawHighlightCircleEnabled(): Boolean { - return mDrawHighlightCircleEnabled - } - - /** Sets whether highlight circle should be drawn or not */ - override fun setDrawHighlightCircleEnabled(enabled: Boolean) { - mDrawHighlightCircleEnabled = enabled - } - - override fun getHighlightCircleFillColor(): Int { - return mHighlightCircleFillColor - } - - /** Returns the stroke color for highlight circle. - * If Utils.COLOR_NONE, the color of the dataset is taken. */ - override fun getHighlightCircleStrokeColor(): Int { - return mHighlightCircleStrokeColor - } - - override fun getHighlightCircleStrokeAlpha(): Int { - return mHighlightCircleStrokeAlpha - } - - override fun getHighlightCircleInnerRadius(): Float { - return mHighlightCircleInnerRadius - } - - override fun getHighlightCircleOuterRadius(): Float { - return mHighlightCircleOuterRadius - } - - override fun getHighlightCircleStrokeWidth(): Float { - return mHighlightCircleStrokeWidth - } + override var isDrawHighlightCircleEnabled: Boolean + get() = mDrawHighlightCircleEnabled + set(value) { + mDrawHighlightCircleEnabled = value + } + override var highlightCircleFillColor: Int + get() = mHighlightCircleFillColor + set(value) { + mHighlightCircleFillColor = value + } + override var highlightCircleStrokeColor: Int + get() = mHighlightCircleStrokeColor + set(value) { + mHighlightCircleStrokeColor = value + } + override var highlightCircleStrokeAlpha: Int + get() = mHighlightCircleStrokeAlpha + set(value) { + mHighlightCircleStrokeAlpha = value + } + override var highlightCircleInnerRadius: Float + get() = mHighlightCircleInnerRadius + set(value) { + mHighlightCircleInnerRadius = value + } + override var highlightCircleOuterRadius: Float + get() = mHighlightCircleOuterRadius + set(value) { + mHighlightCircleOuterRadius = value + } + override var highlightCircleStrokeWidth: Float + get() = mHighlightCircleStrokeWidth + set(value) { + mHighlightCircleStrokeWidth = value + } override fun copy(): DataSet { val entries: MutableList = mutableListOf() @@ -76,4 +76,5 @@ open class RadarDataSet(yVals: MutableList?, label: String = "") : L radarDataSet.mHighlightCircleStrokeColor = mHighlightCircleStrokeColor radarDataSet.mHighlightCircleStrokeWidth = mHighlightCircleStrokeWidth } + } diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.java b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.java deleted file mode 100644 index 8af00d5376..0000000000 --- a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.github.mikephil.charting.interfaces.datasets; - -import com.github.mikephil.charting.data.RadarEntry; - -/** - * Created by Philipp Jahoda on 03/11/15. - */ -public interface IRadarDataSet extends ILineRadarDataSet { - - /// flag indicating whether highlight circle should be drawn or not - boolean isDrawHighlightCircleEnabled(); - - /// Sets whether highlight circle should be drawn or not - void setDrawHighlightCircleEnabled(boolean enabled); - - int getHighlightCircleFillColor(); - - /// The stroke color for highlight circle. - /// If Utils.COLOR_NONE, the color of the dataset is taken. - int getHighlightCircleStrokeColor(); - - int getHighlightCircleStrokeAlpha(); - - float getHighlightCircleInnerRadius(); - - float getHighlightCircleOuterRadius(); - - float getHighlightCircleStrokeWidth(); - -} diff --git a/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.kt b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.kt new file mode 100644 index 0000000000..c8f174776a --- /dev/null +++ b/MPChartLib/src/main/java/com/github/mikephil/charting/interfaces/datasets/IRadarDataSet.kt @@ -0,0 +1,23 @@ +package com.github.mikephil.charting.interfaces.datasets + +import com.github.mikephil.charting.data.RadarEntry + +interface IRadarDataSet : ILineRadarDataSet { + /** flag indicating whether highlight circle should be drawn or not */ + /** Sets whether highlight circle should be drawn or not */ + var isDrawHighlightCircleEnabled: Boolean + + val highlightCircleFillColor: Int + + /** The stroke color for highlight circle. + * If Utils.COLOR_NONE, the color of the dataset is taken. */ + val highlightCircleStrokeColor: Int + + val highlightCircleStrokeAlpha: Int + + val highlightCircleInnerRadius: Float + + val highlightCircleOuterRadius: Float + + val highlightCircleStrokeWidth: Float +} diff --git a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt index 861b01b54e..bbf4f08d4f 100644 --- a/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt +++ b/app/src/main/kotlin/info/appdev/chartexample/RadarChartActivity.kt @@ -184,7 +184,7 @@ class RadarChartActivity : DemoBase() { R.id.actionToggleHighlightCircle -> { chart!!.data!!.dataSets.forEach { set -> - set.setDrawHighlightCircleEnabled(!set.isDrawHighlightCircleEnabled()) + set.isDrawHighlightCircleEnabled = !set.isDrawHighlightCircleEnabled } chart!!.invalidate() }