删除不需要的类

abel533 · Mar 6, 2016 · b154ac1 · b154ac1
1 parent 2846ae5
commit b154ac1
Show file tree

Hide file tree

Showing 25 changed files with 90 additions and 2,900 deletions.
diff --git a/src/main/java/com/github/abel533/echarts/Option.java b/src/main/java/com/github/abel533/echarts/Option.java
@@ -860,6 +860,15 @@ public DataRange dataRange() {
         return this.dataRange;
     }
 
+    /**
+     * 数据区域缩放（详见dataZoom）,数据展现范围选择
+     */
+    public DataZoom dataZoomNew() {
+        DataZoom dataZoom = new DataZoom();
+        this.dataZoom().add(dataZoom);
+        return dataZoom;
+    }
+
     /**
      * 数据区域缩放（详见dataZoom）,数据展现范围选择
      */

diff --git a/src/main/java/com/github/abel533/echarts/axis/ValueAxis.java b/src/main/java/com/github/abel533/echarts/axis/ValueAxis.java
@@ -57,12 +57,6 @@ public class ValueAxis extends Axis<ValueAxis> {
      */
     private Integer splitNumber;
 
-    /**
-     * [数值型]数值轴两端空白策略，数组内数值代表百分比，
-     * [原始数据最小值与最终最小值之间的差额，原始数据最大值与最终最大值之间的差额]
-     */
-    private Double[] boundaryGap;
-
     /**
      * 构造函数
      */
@@ -121,39 +115,6 @@ public ValueAxis splitNumber(Integer splitNumber) {
         return this;
     }
 
-
-    /**
-     * 获取boundaryGap值
-     */
-    public Double[] boundaryGap() {
-        if (this.boundaryGap == null) {
-            this.boundaryGap = new Double[2];
-        }
-        return this.boundaryGap;
-    }
-
-    /**
-     * 设置boundaryGap值
-     *
-     * @param boundaryGap
-     */
-    public ValueAxis boundaryGap(Double[] boundaryGap) {
-        this.boundaryGap = boundaryGap;
-        return this;
-    }
-
-    /**
-     * 设置boundaryGap值
-     *
-     * @param min
-     * @param max
-     */
-    public ValueAxis boundaryGap(Double min, Double max) {
-        this.boundaryGap()[0] = min;
-        this.boundaryGap()[1] = max;
-        return this;
-    }
-
     /**
      * 获取precision值
      */
@@ -202,23 +163,6 @@ public void setSplitNumber(Integer splitNumber) {
         this.splitNumber = splitNumber;
     }
 
-
-    /**
-     * 获取boundaryGap值
-     */
-    public Double[] getBoundaryGap() {
-        return boundaryGap;
-    }
-
-    /**
-     * 设置boundaryGap值
-     *
-     * @param boundaryGap
-     */
-    public void setBoundaryGap(Double[] boundaryGap) {
-        this.boundaryGap = boundaryGap;
-    }
-
     /**
      * 获取nameLocation值
      */

diff --git a/src/main/java/com/github/abel533/echarts/code/SeriesType.java b/src/main/java/com/github/abel533/echarts/code/SeriesType.java
@@ -49,7 +49,7 @@ public enum SeriesType {
     //venn,//韦恩图
     treemap,//矩形树图
     //wordCloud,//词云
-    tree,//树图
+    //tree,//树图
     heatmap,//热力图
     boxplot,//中文可以称为『箱形图』、『盒须图』、『盒式图』、『盒状图』、『箱线图』++++++++++++++++++++++++
     parallel,//平行坐标系++++++++++++++++++++++

diff --git a/src/main/java/com/github/abel533/echarts/json/SeriesDeserializer.java b/src/main/java/com/github/abel533/echarts/json/SeriesDeserializer.java
@@ -63,26 +63,32 @@ public Series deserialize(JsonElement json, Type typeOfT, JsonDeserializationCon
             case pie:
                 series = context.deserialize(jsonObject, Pie.class);
                 break;
-            case force:
-                series = context.deserialize(jsonObject, Force.class);
-                break;
             case gauge:
                 series = context.deserialize(jsonObject, Gauge.class);
                 break;
             case map:
                 series = context.deserialize(jsonObject, Map.class);
                 break;
-            case island:
-                series = context.deserialize(jsonObject, Island.class);
+            case lines:
+                series = context.deserialize(jsonObject, Lines.class);
+                break;
+            case effectScatter:
+                series = context.deserialize(jsonObject, EffectScatter.class);
+                break;
+            case candlestick:
+                series = context.deserialize(jsonObject, Candlestick.class);
+                break;
+            case graph:
+                series = context.deserialize(jsonObject, Graph.class);
                 break;
-            case k:
-                series = context.deserialize(jsonObject, K.class);
+            case boxplot:
+                series = context.deserialize(jsonObject, Boxplot.class);
                 break;
-            case radar:
-                series = context.deserialize(jsonObject, Radar.class);
+            case parallel:
+                series = context.deserialize(jsonObject, Parallel.class);
                 break;
-            case chord:
-                series = context.deserialize(jsonObject, Chord.class);
+            case sankey:
+                series = context.deserialize(jsonObject, Sankey.class);
                 break;
         }
         return series;