删除不需要的类

abel533 · Mar 6, 2016 · dda32c4 · dda32c4
1 parent 68ea376
commit dda32c4
Show file tree

Hide file tree

Showing 7 changed files with 298 additions and 41 deletions.
diff --git a/src/main/java/com/github/abel533/echarts/Option.java b/src/main/java/com/github/abel533/echarts/Option.java
@@ -197,6 +197,12 @@ public List<VisualMap> visualMap() {
         return this.visualMap;
     }
 
+    public VisualMap visualMapNew() {
+        VisualMap v = new VisualMap();
+        this.visualMap().add(v);
+        return v;
+    }
+
     public Option visualMap(List<VisualMap> visualMap) {
         this.visualMap = visualMap;
         return this;

diff --git a/src/main/java/com/github/abel533/echarts/Tooltip.java b/src/main/java/com/github/abel533/echarts/Tooltip.java
@@ -24,6 +24,7 @@
 
 package com.github.abel533.echarts;
 
+import com.github.abel533.echarts.code.Position;
 import com.github.abel533.echarts.code.Trigger;
 import com.github.abel533.echarts.code.TriggerOn;
 import com.github.abel533.echarts.style.TextStyle;
@@ -203,6 +204,16 @@ public Tooltip position(Object position) {
         return this;
     }
 
+    /**
+     * 设置position值
+     *
+     * @param position
+     */
+    public Tooltip position(Position position) {
+        this.position = position;
+        return this;
+    }
+
     /**
      * 获取formatter值
      */

diff --git a/src/main/java/com/github/abel533/echarts/series/Series.java b/src/main/java/com/github/abel533/echarts/series/Series.java
@@ -326,6 +326,9 @@ public T label(ItemStyle label) {
     }
 
     public ItemStyle label() {
+        if (this.label == null) {
+            this.label = new ItemStyle();
+        }
         return this.label;
     }
 

diff --git a/src/main/java/com/github/abel533/echarts/style/itemstyle/Style.java b/src/main/java/com/github/abel533/echarts/style/itemstyle/Style.java
@@ -112,6 +112,132 @@ public abstract class Style<T> implements Serializable {
      * 柱形边框线宽，单位px，默认为1
      */
     private Integer barBorderWidth;
+    /**
+     * 显示
+     */
+    private Boolean show;
+    /**
+     * 图形阴影的模糊大小。该属性配合 shadowColor,shadowOffsetX, shadowOffsetY 一起设置图形的阴影效果
+     */
+    private Integer shadowBlur;
+    /**
+     * 阴影颜色
+     */
+    private String shadowColor;
+    /**
+     * 阴影水平方向上的偏移距离
+     */
+    private Integer shadowOffsetX;
+    /**
+     * 阴影垂直方向上的偏移距离
+     */
+    private Integer shadowOffsetY;
+    /**
+     * 图形透明度。支持从 0 到 1 的数字，为 0 时不绘制该图形
+     */
+    private Double opacity;
+
+    public Integer shadowBlur() {
+        return this.shadowBlur;
+    }
+
+    public T shadowBlur(Integer shadowBlur) {
+        this.shadowBlur = shadowBlur;
+        return (T) this;
+    }
+
+    public String shadowColor() {
+        return this.shadowColor;
+    }
+
+    public T shadowColor(String shadowColor) {
+        this.shadowColor = shadowColor;
+        return (T) this;
+    }
+
+    public Integer shadowOffsetX() {
+        return this.shadowOffsetX;
+    }
+
+    public T shadowOffsetX(Integer shadowOffsetX) {
+        this.shadowOffsetX = shadowOffsetX;
+        return (T) this;
+    }
+
+    public Integer shadowOffsetY() {
+        return this.shadowOffsetY;
+    }
+
+    public T shadowOffsetY(Integer shadowOffsetY) {
+        this.shadowOffsetY = shadowOffsetY;
+        return (T) this;
+    }
+
+    public Double opacity() {
+        return this.opacity;
+    }
+
+    public T opacity(Double opacity) {
+        this.opacity = opacity;
+        return (T) this;
+    }
+
+    public Integer getShadowBlur() {
+        return shadowBlur;
+    }
+
+    public void setShadowBlur(Integer shadowBlur) {
+        this.shadowBlur = shadowBlur;
+    }
+
+    public String getShadowColor() {
+        return shadowColor;
+    }
+
+    public void setShadowColor(String shadowColor) {
+        this.shadowColor = shadowColor;
+    }
+
+    public Integer getShadowOffsetX() {
+        return shadowOffsetX;
+    }
+
+    public void setShadowOffsetX(Integer shadowOffsetX) {
+        this.shadowOffsetX = shadowOffsetX;
+    }
+
+    public Integer getShadowOffsetY() {
+        return shadowOffsetY;
+    }
+
+    public void setShadowOffsetY(Integer shadowOffsetY) {
+        this.shadowOffsetY = shadowOffsetY;
+    }
+
+    public Double getOpacity() {
+        return opacity;
+    }
+
+    public void setOpacity(Double opacity) {
+        this.opacity = opacity;
+    }
+
+    public Boolean show() {
+        return this.show;
+    }
+
+    public T show(Boolean show) {
+        this.show = show;
+        return (T) this;
+    }
+
+    public Boolean getShow() {
+        return show;
+    }
+
+    public void setShow(Boolean show) {
+        this.show = show;
+    }
 
     /**
      * 设置label值

diff --git a/src/test/java/com/github/abel533/echarts/Generator.java b/src/test/java/com/github/abel533/echarts/Generator.java
@@ -0,0 +1,84 @@
+package com.github.abel533.echarts;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author liuzh_3nofxnp
+ * @since 2016-02-28 09:58
+ */
+public class Generator {
+    public static void main(String[] args) {
+        String _lines = "private TextStyle textStyle;";
+        String _type = "DataZoom";
+//        simple(_type, _lines);
+        simpleNew(_type, _lines);
+    }
+
+    /**
+     * 最简单的形式
+     *
+     * @param _type
+     * @param _lines
+     */
+    public static void simple(String _type, String _lines) {
+        String _this = "\treturn this;";
+        if (_type.equals("T")) {
+            _this = "\treturn (T) this;";
+        }
+        String[] lines = lines(_lines);
+        for (String line : lines) {
+            String[] ls = line.split(" ");
+            System.out.println("public " + ls[1] + " " + ls[2] + "(){");
+            System.out.println("\treturn this." + ls[2] + ";");
+            System.out.println("}\n");
+            System.out.println("public " + _type + " " + ls[2] + "(" + ls[1] + " " + ls[2] + "){");
+            System.out.println("\tthis." + ls[2] + " = " + ls[2] + ";");
+            System.out.println(_this);
+            System.out.println("}\n");
+        }
+    }
+
+    /**
+     * 最简单的形式
+     *
+     * @param _type
+     * @param _lines
+     */
+    public static void simpleNew(String _type, String _lines) {
+        String _this = "\treturn this;";
+        if (_type.equals("T")) {
+            _this = "\treturn (T) this;";
+        }
+        String[] lines = lines(_lines);
+        for (String line : lines) {
+            String[] ls = line.split(" ");
+            System.out.println("public " + ls[1] + " " + ls[2] + "(){");
+            System.out.println("\tif(this." + ls[2] + " == null){");
+            System.out.println("\t\tthis." + ls[2] + "= new " + ls[1] + "();");
+            System.out.println("\t}");
+            System.out.println("\treturn this." + ls[2] + ";");
+            System.out.println("}\n");
+            System.out.println("public " + _type + " " + ls[2] + "(" + ls[1] + " " + ls[2] + "){");
+            System.out.println("\tthis." + ls[2] + " = " + ls[2] + ";");
+            System.out.println(_this);
+            System.out.println("}\n");
+        }
+    }
+
+    public static String[] lines(String _lines) {
+        List<String> lineList = new ArrayList<String>();
+        String[] lines = _lines.split("\n");
+        for (String line : lines) {
+            line = line.trim();
+            if (line.length() == 0) {
+                continue;
+            }
+            if (line.endsWith(";")) {
+                line = line.substring(0, line.length() - 1);
+            }
+            lineList.add(line);
+        }
+        return lineList.toArray(new String[]{});
+    }
+}
diff --git a/src/test/java/com/github/abel533/echarts/samples/heatmap/HeatmapTest.java b/src/test/java/com/github/abel533/echarts/samples/heatmap/HeatmapTest.java
@@ -24,59 +24,86 @@
 
 package com.github.abel533.echarts.samples.heatmap;
 
-import com.github.abel533.echarts.data.GradientColor;
+import com.github.abel533.echarts.axis.CategoryAxis;
+import com.github.abel533.echarts.code.Orient;
+import com.github.abel533.echarts.code.Position;
+import com.github.abel533.echarts.code.X;
 import com.github.abel533.echarts.series.Heatmap;
 import com.github.abel533.echarts.util.EnhancedOption;
 import org.junit.Test;
 
-import java.util.LinkedList;
-import java.util.List;
-
 /**
  * @author liuzh
  */
 public class HeatmapTest {
 
-    public List<Object[]> headData() {
-        List<Object[]> list = new LinkedList<Object[]>();
-        for (int i = 0; i < 20; ++i) {
-            list.add(new Object[]{
-                    400 + Math.random() * 300,
-                    5 + Math.random() * 10,
-                    Math.random()
-            });
-        }
-        for (int i = 0; i < 100; ++i) {
-            list.add(new Object[]{
-                    100 + Math.random() * 600,
-                    150 + Math.random() * 50,
-                    Math.random()
-            });
-        }
-        for (int i = 0; i < 200; ++i) {
-            list.add(new Object[]{
-                    400 + Math.random() * 1000,
-                    5 + Math.random() * 800,
-                    Math.random() * 0.5
-            });
-        }
-        return list;
-    }
-
     @Test
     public void test() {
         //地址：http://echarts.baidu.com/doc/example/heatmap.html
         EnhancedOption option = new EnhancedOption();
-        option.title().text("热力图自定义样式");
-        Heatmap heatmap = new Heatmap();
-        heatmap.data(headData().toArray());
-        heatmap.hoverable(false)
-                .gradientColors(
-                        new GradientColor(0.4, "green"),
-                        new GradientColor(0.5, "yellow"),
-                        new GradientColor(0.8, "orange"),
-                        new GradientColor(1d, "red"));
-        heatmap.minAlpha(0.2).valueScale(2d).opacity(0.6);
+        option.tooltip().position(Position.top);
+        option.animation(false);
+
+        CategoryAxis hoursC = new CategoryAxis();
+        hoursC.data("12a", "1a", "2a", "3a", "4a", "5a", "6a",
+                "7a", "8a", "9a", "10a", "11a",
+                "12p", "1p", "2p", "3p", "4p", "5p",
+                "6p", "7p", "8p", "9p", "10p", "11p");
+
+        CategoryAxis daysC = new CategoryAxis();
+        daysC.data("Saturday", "Friday", "Thursday",
+                "Wednesday", "Tuesday", "Monday", "Sunday");
+
+        option.xAxis(hoursC).yAxis(daysC);
+        option.grid().height("50%").y("10%");
+        option.visualMapNew().min(1).max(10).calculable(true).orient(Orient.horizontal).left(X.center).bottom("15%");
+
+        Object[] data = new Object[]{new Integer[]{0, 0, 5}, new Integer[]{0, 1, 1}, new Integer[]{0, 2, 0}, new Integer[]{0, 3, 0}, new Integer[]{0, 4, 0},
+                new Integer[]{0, 5, 0}, new Integer[]{0, 6, 0}, new Integer[]{0, 7, 0}, new Integer[]{0, 8, 0}, new Integer[]{0, 9, 0},
+                new Integer[]{0, 10, 0}, new Integer[]{0, 11, 2}, new Integer[]{0, 12, 4}, new Integer[]{0, 13, 1}, new Integer[]{0, 14, 1},
+                new Integer[]{0, 15, 3}, new Integer[]{0, 16, 4}, new Integer[]{0, 17, 6}, new Integer[]{0, 18, 4}, new Integer[]{0, 19, 4},
+                new Integer[]{0, 20, 3}, new Integer[]{0, 21, 3}, new Integer[]{0, 22, 2}, new Integer[]{0, 23, 5}, new Integer[]{1, 0, 7},
+                new Integer[]{1, 1, 0}, new Integer[]{1, 2, 0}, new Integer[]{1, 3, 0}, new Integer[]{1, 4, 0}, new Integer[]{1, 5, 0},
+                new Integer[]{1, 6, 0}, new Integer[]{1, 7, 0}, new Integer[]{1, 8, 0}, new Integer[]{1, 9, 0}, new Integer[]{1, 10, 5},
+                new Integer[]{1, 11, 2}, new Integer[]{1, 12, 2}, new Integer[]{1, 13, 6}, new Integer[]{1, 14, 9}, new Integer[]{1, 15, 11},
+                new Integer[]{1, 16, 6}, new Integer[]{1, 17, 7}, new Integer[]{1, 18, 8}, new Integer[]{1, 19, 12}, new Integer[]{1, 20, 5},
+                new Integer[]{1, 21, 5}, new Integer[]{1, 22, 7}, new Integer[]{1, 23, 2}, new Integer[]{2, 0, 1}, new Integer[]{2, 1, 1},
+                new Integer[]{2, 2, 0}, new Integer[]{2, 3, 0}, new Integer[]{2, 4, 0}, new Integer[]{2, 5, 0}, new Integer[]{2, 6, 0},
+                new Integer[]{2, 7, 0}, new Integer[]{2, 8, 0}, new Integer[]{2, 9, 0}, new Integer[]{2, 10, 3}, new Integer[]{2, 11, 2},
+                new Integer[]{2, 12, 1}, new Integer[]{2, 13, 9}, new Integer[]{2, 14, 8}, new Integer[]{2, 15, 10}, new Integer[]{2, 16, 6},
+                new Integer[]{2, 17, 5}, new Integer[]{2, 18, 5}, new Integer[]{2, 19, 5}, new Integer[]{2, 20, 7}, new Integer[]{2, 21, 4},
+                new Integer[]{2, 22, 2}, new Integer[]{2, 23, 4}, new Integer[]{3, 0, 7}, new Integer[]{3, 1, 3}, new Integer[]{3, 2, 0},
+                new Integer[]{3, 3, 0}, new Integer[]{3, 4, 0}, new Integer[]{3, 5, 0}, new Integer[]{3, 6, 0}, new Integer[]{3, 7, 0},
+                new Integer[]{3, 8, 1}, new Integer[]{3, 9, 0}, new Integer[]{3, 10, 5}, new Integer[]{3, 11, 4}, new Integer[]{3, 12, 7},
+                new Integer[]{3, 13, 14}, new Integer[]{3, 14, 13}, new Integer[]{3, 15, 12}, new Integer[]{3, 16, 9}, new Integer[]{3, 17, 5},
+                new Integer[]{3, 18, 5}, new Integer[]{3, 19, 10}, new Integer[]{3, 20, 6}, new Integer[]{3, 21, 4}, new Integer[]{3, 22, 4},
+                new Integer[]{3, 23, 1}, new Integer[]{4, 0, 1}, new Integer[]{4, 1, 3}, new Integer[]{4, 2, 0}, new Integer[]{4, 3, 0},
+                new Integer[]{4, 4, 0}, new Integer[]{4, 5, 1}, new Integer[]{4, 6, 0}, new Integer[]{4, 7, 0}, new Integer[]{4, 8, 0},
+                new Integer[]{4, 9, 2}, new Integer[]{4, 10, 4}, new Integer[]{4, 11, 4}, new Integer[]{4, 12, 2}, new Integer[]{4, 13, 4},
+                new Integer[]{4, 14, 4}, new Integer[]{4, 15, 14}, new Integer[]{4, 16, 12}, new Integer[]{4, 17, 1}, new Integer[]{4, 18, 8},
+                new Integer[]{4, 19, 5}, new Integer[]{4, 20, 3}, new Integer[]{4, 21, 7}, new Integer[]{4, 22, 3}, new Integer[]{4, 23, 0},
+                new Integer[]{5, 0, 2}, new Integer[]{5, 1, 1}, new Integer[]{5, 2, 0}, new Integer[]{5, 3, 3}, new Integer[]{5, 4, 0},
+                new Integer[]{5, 5, 0}, new Integer[]{5, 6, 0}, new Integer[]{5, 7, 0}, new Integer[]{5, 8, 2}, new Integer[]{5, 9, 0},
+                new Integer[]{5, 10, 4}, new Integer[]{5, 11, 1}, new Integer[]{5, 12, 5}, new Integer[]{5, 13, 10}, new Integer[]{5, 14, 5},
+                new Integer[]{5, 15, 7}, new Integer[]{5, 16, 11}, new Integer[]{5, 17, 6}, new Integer[]{5, 18, 0}, new Integer[]{5, 19, 5},
+                new Integer[]{5, 20, 3}, new Integer[]{5, 21, 4}, new Integer[]{5, 22, 2}, new Integer[]{5, 23, 0}, new Integer[]{6, 0, 1},
+                new Integer[]{6, 1, 0}, new Integer[]{6, 2, 0}, new Integer[]{6, 3, 0}, new Integer[]{6, 4, 0}, new Integer[]{6, 5, 0},
+                new Integer[]{6, 6, 0}, new Integer[]{6, 7, 0}, new Integer[]{6, 8, 0}, new Integer[]{6, 9, 0}, new Integer[]{6, 10, 1},
+                new Integer[]{6, 11, 0}, new Integer[]{6, 12, 2}, new Integer[]{6, 13, 1}, new Integer[]{6, 14, 3}, new Integer[]{6, 15, 4},
+                new Integer[]{6, 16, 0}, new Integer[]{6, 17, 0}, new Integer[]{6, 18, 0}, new Integer[]{6, 19, 0}, new Integer[]{6, 20, 1},
+                new Integer[]{6, 21, 2}, new Integer[]{6, 22, 2}, new Integer[]{6, 23, 6}};
+
+        Object[] datas = new Object[data.length];
+        for (int i = 0; i < data.length; i++) {
+            Integer[] is = (Integer[]) data[i];
+            datas[i] = new Integer[]{is[1], is[0], is[2]};
+        }
+
+        Heatmap heatmap = new Heatmap("Punch Card");
+        heatmap.data(datas);
+        heatmap.label().normal().show(true);
+        heatmap.itemStyle().emphasis().shadowBlur(10).shadowColor("rgba(0, 0, 0, 0.5)");
+
         option.series(heatmap);
         option.exportToHtml("heatmap.html");
         option.view();