@@ -18,41 +18,31 @@ import info.appdev.charting.renderer.CombinedChartRenderer
1818import timber.log.Timber
1919
2020/* *
21- * This chart class allows the combination of lines, bars, scatter and candle
22- * data all displayed in one chart area.
21+ * This chart class allows the combination of lines, bars, scatter and candle data all displayed in one chart area.
2322 */
2423@Suppress(" unused" )
2524open class CombinedChart : BarLineChartBase <CombinedData >, CombinedDataProvider {
2625 /* *
27- * if set to true, all values are drawn above their bars, instead of below
28- * their top
26+ * if set to true, all values are drawn above their bars, instead of below their top
2927 */
3028 override var isDrawValueAboveBarEnabled: Boolean = true
3129
3230
33- /* *
34- * @return true the highlight operation is be full-bar oriented, false if single-value
35- */
3631 /* *
3732 * Set this to true to make the highlight operation full-bar oriented,
3833 * false to make it highlight single values (relevant only for stacked).
3934 */
40- /* *
41- * flag that indicates whether the highlight should be full-bar oriented, or single-value?
42- */
4335 override var isHighlightFullBarEnabled: Boolean = false
4436
4537 /* *
46- * if set to true, a grey area is drawn behind each bar that indicates the
47- * maximum value
38+ * if set to true, a grey area is drawn behind each bar that indicates the maximum value
4839 */
4940 override var isDrawBarShadowEnabled: Boolean = false
5041
5142 protected var mDrawOrder: MutableList <DrawOrder >? = null
5243
5344 /* *
54- * enum that allows to specify the order in which the different data objects
55- * for the combined-chart are drawn
45+ * enum that allows to specify the order in which the different data objects for the combined-chart are drawn
5646 */
5747 enum class DrawOrder {
5848 BAR , BUBBLE , LINE , CANDLE , SCATTER
@@ -92,8 +82,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
9282
9383 /* *
9484 * Returns the Highlight object (contains x-index and DataSet index) of the selected value at the given touch
95- * point
96- * inside the CombinedChart.
85+ * point inside the CombinedChart.
9786 */
9887 override fun getHighlightByTouchPoint (x : Float , y : Float ): Highlight ? {
9988 if (mData == null ) {
@@ -162,8 +151,7 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
162151 }
163152
164153 /* *
165- * If set to true, all values are drawn above their bars, instead of below
166- * their top.
154+ * If set to true, all values are drawn above their bars, instead of below their top.
167155 */
168156 fun setDrawValueAboveBar (enabled : Boolean ) {
169157 this .isDrawValueAboveBarEnabled = enabled
@@ -198,7 +186,6 @@ open class CombinedChart : BarLineChartBase<CombinedData>, CombinedDataProvider
198186 */
199187 override fun drawMarkers (canvas : Canvas ) {
200188 // if there is no marker view or drawing marker is disabled
201-
202189 if (! isDrawMarkersEnabled || ! valuesToHighlight()) {
203190 return
204191 }
0 commit comments