Преглед на файлове

Remove useless AAWaterfall

AnAn преди 4 години
родител
ревизия
8b450665f8

+ 0 - 63
charts/src/main/java/com/github/aachartmodel/aainfographics/aaoptionsmodel/AAWaterfall.kt

@@ -1,63 +0,0 @@
-/**
- * Copyright (C), 2015-2019, 飞牛集达有限公司
- * FileName: AAWaterfall
- * Author: ios-fn
- * Date: 2019-06-29 22:47
- * Description:
- * History:
- */
-/**
- * ◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉ ...... SOURCE CODE ......◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉
- * ◉◉◉...................................................       ◉◉◉
- * ◉◉◉   https://github.com/AAChartModel/AAChartCore            ◉◉◉
- * ◉◉◉   https://github.com/AAChartModel/AAChartCore-Kotlin     ◉◉◉
- * ◉◉◉...................................................       ◉◉◉
- * ◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉ ...... SOURCE CODE ......◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉◉
- */
-
-/**
-
- * -------------------------------------------------------------------------------
- *
- *  🌕 🌖 🌗 🌘  ❀❀❀   WARM TIPS!!!   ❀❀❀ 🌑 🌒 🌓 🌔
- *
- * Please contact me on GitHub,if there are any problems encountered in use.
- * GitHub Issues : https://github.com/AAChartModel/AAChartCore-Kotlin/issues
- * -------------------------------------------------------------------------------
- * And if you want to contribute for this project, please contact me as well
- * GitHub        : https://github.com/AAChartModel
- * StackOverflow : https://stackoverflow.com/users/7842508/codeforu
- * JianShu       : http://www.jianshu.com/u/f1e6753d4254
- * SegmentFault  : https://segmentfault.com/u/huanghunbieguan
- *
- * -------------------------------------------------------------------------------
-
- */
-package com.github.aachartmodel.aainfographics.aaoptionsmodel;
-
-class AAWaterfall {
-    var upColor: String? = null
-    var color: String? = null
-    var borderWidth: Float? = null
-    var data: Array<Any>? = null
-
-    fun upColor(prop: String): AAWaterfall {
-        upColor = prop
-        return this
-    }
-
-    fun color(prop: String): AAWaterfall {
-        color = prop
-        return this
-    }
-
-    fun borderWidth(prop: Float?): AAWaterfall {
-        borderWidth = prop
-        return this
-    }
-
-    fun data(prop: Array<Any>): AAWaterfall {
-        data = prop
-        return this
-    }
-}

+ 8 - 9
sample/src/main/java/com/github/aachartmodel/aainfographics/demo/chartcomposer/SpecialChartComposer.kt

@@ -842,8 +842,7 @@ object SpecialChartComposer{
         dataElement7["isSum"] = true
         dataElement7["color"] = "#04d69f"
 
-        val seriesElement = AAWaterfall()
-            .upColor("#9b43b4")
+        val seriesElement = AASeriesElement()
             .color("#ef476f")
             .borderWidth(0f)
             .data(arrayOf(
@@ -854,14 +853,13 @@ object SpecialChartComposer{
                     dataElement5,
                     dataElement6,
                     dataElement7
-                )
-            )
+                ))
 
         return AAChartModel()
             .chartType(AAChartType.Waterfall)
             .title("WATERFALL CHART")
             .subtitle("virtual data")
-//            .series(arrayOf(seriesElement))
+            .series(arrayOf(seriesElement))
     }
     fun configurePyramidChart(): AAChartModel  {
         return AAChartModel()
@@ -903,8 +901,8 @@ object SpecialChartComposer{
                         arrayOf("Objective-C", 12379),
                         arrayOf("JavaScript",  14286),
                         arrayOf("Go",          15552),
-                        arrayOf("Python",      18654))
-                    )))
+                        arrayOf("Python",      18654)
+                    ))))
     }
 
     fun configureErrorbarChart(): AAChartModel {
@@ -919,8 +917,9 @@ object SpecialChartComposer{
                         .name("降水")
                         .type(AAChartType.Column)
                         .color("#06caf4")
-                        .data(arrayOf(49.9, 71.5, 106.4, 129.2, 144.0, 176.0,
-                            135.6, 148.5, 216.4, 194.1, 95.6, 54.4
+                        .data(arrayOf(
+                                49.9, 71.5, 106.4, 129.2, 144.0, 176.0,
+                                135.6, 148.5, 216.4, 194.1, 95.6, 54.4
                             )),
                     AASeriesElement()
                         .name("降雨误差")