version 0.1.1

shuxiang · Jul 17, 2017 · 8b87e3a · 8b87e3a
1 parent af9ac02
commit 8b87e3a
Show file tree

Hide file tree

Showing 97 changed files with 2,260 additions and 201 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,9 +8,7 @@ __pycache__/
 .idea
 # Distribution / packaging
 .Python
-/json/
 /js/
-/images_/
 env/
 build/
 develop-eggs/

diff --git a/README.md b/README.md
diff --git a/example.md b/example.md
@@ -0,0 +1,114 @@
+```python
+import math
+from pyecharts import Polar
+
+data = []
+for i in range(101):
+    theta = i / 100 * 360
+    r = 5 * (1 + math.sin(theta / 180 * math.pi))
+    data.append([r, theta])
+hour = [i for i in range(1, 25)]
+polar = Polar("极坐标系示例", width=1200, height=600)
+polar.add("Love", data, angle_data=hour, boundary_gap=False,start_angle=0)
+polar.show_config()
+polar.render()
+```
+![example-0](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-0.png)
+
+```python
+import math
+from pyecharts import Polar
+
+data = []
+for i in range(361):
+    t = i / 180 * math.pi
+    r = math.sin(2 * t) * math.cos(2 * t)
+    data.append([r, i])
+polar = Polar("极坐标系示例", width=1200, height=600)
+polar.add("Flower", data, start_angle=0, symbol=None, axis_range=[0, None])
+polar.show_config()
+polar.render()
+```
+![example-1](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-1.png)
+
+```python
+from pyecharts import Scatter
+
+scatter = Scatter("散点图示例", width=800, height=480)
+v1 ,v2 = scatter.draw("../images/love.png")
+scatter.add("Love", v1, v2)
+scatter.render()
+```
+![example-2](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-2.png)
+
+```python
+from pyecharts import Scatter
+
+scatter = Scatter("散点图示例", width=1000, height=480)
+v1 ,v2 = scatter.draw("../images/cup.png")
+scatter.add("Cup", v1, v2)
+scatter.render()
+```
+![example-3](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-3.png)
+
+```python
+from pyecharts import Scatter
+
+scatter = Scatter("散点图示例", width=1000, height=480)
+v1 ,v2 = scatter.draw("../images/cup.png")
+scatter.add("Cup", v1, v2, label_color=["#000"])
+scatter.render()
+```
+![example-4](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-4.png)
+
+```python
+from pyecharts import Line
+
+attr = ['周一', '周二', '周三', '周四', '周五', '周六', '周日', ]
+line = Line("折线图示例")
+line.add("最高气温", attr, [11, 11, 15, 13, 12, 13, 10], mark_point=["max", "min"],mark_line=["average"])
+line.add("最低气温", attr, [1, -2, 2, 5, 3, 2, 0], mark_point=["max", "min"], mark_line=["average"], yaxis_formatter="°C")
+line.show_config()
+line.render()
+```
+![example-5](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-5.gif)
+
+```python
+from pyecharts import Pie
+
+pie = Pie("饼图示例", title_pos='center', width=1000, height=600)
+pie.add("", ['A', 'B', 'C', 'D', 'E', 'F'], [335, 321, 234, 135, 251, 148], radius=[40, 55],is_label_show=True)
+pie.add("", ['H', 'I', 'J'], [335, 679, 204], radius=[0, 30], legend_orient='vertical', legend_pos='left')
+pie.show_config()
+pie.render()
+```
+![example-6](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-6.png)
+
+```python
+import random
+from pyecharts import Pie
+
+attr = ['A', 'B', 'C', 'D', 'E', 'F']
+pie = Pie("饼图示例", width=1000, height=600)
+pie.add("", attr, [random.randint(0, 100) for _ in range(6)], radius=[50, 55], center=[25, 50],is_random=True)
+pie.add("", attr, [random.randint(20, 100) for _ in range(6)], radius=[0, 45], center=[25, 50],rosetype='area')
+pie.add("", attr, [random.randint(0, 100) for _ in range(6)], radius=[50, 55], center=[65, 50],is_random=True)
+pie.add("", attr, [random.randint(20, 100) for _ in range(6)], radius=[0, 45], center=[65, 50],rosetype='radius')
+pie.show_config()
+pie.render()
+```
+![example-7](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-7.gif)
+
+```python
+from pyecharts import Bar
+
+attr = ["{}月".format(i) for i in range(1, 13)]
+v1 = [2.0, 4.9, 7.0, 23.2, 25.6, 76.7, 135.6, 162.2, 32.6, 20.0, 6.4, 3.3]
+v2 = [2.6, 5.9, 9.0, 26.4, 28.7, 70.7, 175.6, 182.2, 48.7, 18.8, 6.0, 2.3]
+bar = Bar("柱状图示例")
+bar.add("蒸发量", attr, v1, mark_line=["average"], mark_point=["max", "min"])
+bar.add("降水量", attr, v2, mark_line=["average"], mark_point=["max", "min"])
+bar.show_config()
+bar.render()
+```
+![example-8](https://github.com/chenjiandongx/pyecharts/blob/master/images/example-8.png)
diff --git a/images/bar-0.gif b/images/bar-0.gif
diff --git a/images/bar-1.gif b/images/bar-1.gif
diff --git a/images/bar-2.png b/images/bar-2.png
diff --git a/images/cup.png b/images/cup.png
diff --git a/images/custom-0.gif b/images/custom-0.gif
diff --git a/images/effectscatter-0.gif b/images/effectscatter-0.gif
diff --git a/images/effectscatter-1.gif b/images/effectscatter-1.gif
diff --git a/images/example-0.png b/images/example-0.png
diff --git a/images/example-1.png b/images/example-1.png
diff --git a/images/example-2.png b/images/example-2.png
diff --git a/images/example-3.png b/images/example-3.png
diff --git a/images/example-4.png b/images/example-4.png
diff --git a/images/example-5.gif b/images/example-5.gif
diff --git a/images/example-6.png b/images/example-6.png
diff --git a/images/example-7.gif b/images/example-7.gif
diff --git a/images/example-8.png b/images/example-8.png
diff --git a/images/funnel-0.gif b/images/funnel-0.gif
diff --git a/images/funnel-1.png b/images/funnel-1.png
diff --git a/images/gauge-0.png b/images/gauge-0.png
diff --git a/images/gauge-1.png b/images/gauge-1.png
diff --git a/images/geo-0.gif b/images/geo-0.gif
diff --git a/images/geo-1.gif b/images/geo-1.gif
diff --git a/images/graph-0.png b/images/graph-0.png
diff --git a/images/graph-1.png b/images/graph-1.png
diff --git a/images/graph-2.gif b/images/graph-2.gif
diff --git a/images/guide-0.png b/images/guide-0.png
diff --git a/images/line-0.gif b/images/line-0.gif
diff --git a/images/line-1.gif b/images/line-1.gif
diff --git a/images/line-2.png b/images/line-2.png
diff --git a/images/line-3.png b/images/line-3.png
diff --git a/images/liquid-0.gif b/images/liquid-0.gif
diff --git a/images/liquid-1.gif b/images/liquid-1.gif
diff --git a/images/liquid-2.png b/images/liquid-2.png
diff --git a/images/love.png b/images/love.png
diff --git a/images/map-0.gif b/images/map-0.gif
diff --git a/images/map-1.gif b/images/map-1.gif
diff --git a/images/map-2.gif b/images/map-2.gif
diff --git a/images/parallel-0.png b/images/parallel-0.png
diff --git a/images/parallel-1.png b/images/parallel-1.png
diff --git a/images/pie-0.gif b/images/pie-0.gif
diff --git a/images/pie-1.png b/images/pie-1.png
diff --git a/images/pie-2.png b/images/pie-2.png
diff --git a/images/poalr-4.png b/images/poalr-4.png
diff --git a/images/polar-0.png b/images/polar-0.png
diff --git a/images/polar-1.png b/images/polar-1.png
diff --git a/images/polar-2.gif b/images/polar-2.gif
diff --git a/images/polar-3.gif b/images/polar-3.gif
diff --git a/images/pyecharts-0.png b/images/pyecharts-0.png
diff --git a/images/pyecharts-1.png b/images/pyecharts-1.png
diff --git a/images/radar-0.gif b/images/radar-0.gif
diff --git a/images/radar-1.gif b/images/radar-1.gif
diff --git a/images/scatter-0.png b/images/scatter-0.png
diff --git a/images/wordcloud-0.png b/images/wordcloud-0.png
diff --git a/images/wordcloud-1.png b/images/wordcloud-1.png
diff --git a/json/weibo.json b/json/weibo.json
diff --git a/pyecharts/__init__.py b/pyecharts/__init__.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.charts.bar import Bar
@@ -9,6 +8,7 @@
 from pyecharts.charts.geo import Geo
 from pyecharts.charts.graph import Graph
 from pyecharts.charts.line import Line
+from pyecharts.charts.liquid import Liquid
 from pyecharts.charts.map import Map
 from pyecharts.charts.parallel import Parallel
 from pyecharts.charts.pie import Pie

diff --git a/pyecharts/__version__.py b/pyecharts/__version__.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 __title__ = 'pyecharts'
 __description__ = 'Python echarts, make charting easier'
 __url__ = 'https://github.com/chenjiandongx/pyecharts'
-__version__ = '1.1.4'
+__version__ = '0.1.1'
 __author__ = 'chenjiandongx'
 __author_email__ = '[email protected]'
 __license__ = 'MIT'

diff --git a/pyecharts/base.py b/pyecharts/base.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 import json
@@ -71,6 +70,7 @@ def add(self, angle_data=None,
             angle_range=None,
             area_color=None,
             area_opacity=None,
+            axis_range=None,
             border_color=None,
             boundary_gap=None,
             center=None,
@@ -93,6 +93,8 @@ def add(self, angle_data=None,
             is_focusnode=None,
             is_label_show=None,
             is_legend_show=None,
+            is_liquid_animation=None,
+            is_liquid_outline_show=None,
             is_random=None,
             is_roam=None,
             is_rotatelabel=None,
@@ -114,6 +116,7 @@ def add(self, angle_data=None,
             line_opacity=None,
             line_type=None,
             line_width=None,
+            liquid_color=None,
             maptype=None,
             mark_line=None,
             mark_point=None,
@@ -139,7 +142,8 @@ def add(self, angle_data=None,
             x_axis=None,
             xaxis_name_pos=None,
             xaxis_name=None,
-            xy_font_size=None,
+            xy_text_size=None,
+            yaxis_formatter=None,
             yaxis_name_pos=None,
             yaxis_name=None):
         """ base 父类的 add 方法只是为了提供提示选项 """
@@ -165,7 +169,8 @@ def show_config(self):
         """ 打印输出 option 所有配置项 """
         pprint(self._option)
 
-    def cast(self, seq):
+    @staticmethod
+    def cast(seq):
         """ 转换数据序列，将带字典和元祖类型的序列转换为 k_lst,v_lst 两个列表
         1.[(A1, B1),(A2, B2),(A3, B3),(A4, B4)] --> k_lst[A[i1,i2...]], v_lst[B[i1,i2...]]
         2.[{A1: B1},{A2: B2},{A3: B3},{A4: B4}] --> k_lst[A[i1,i2...]], v_lst[B[i1,i2...]]
@@ -222,6 +227,9 @@ def render(self, path="render.html"):
             if s.get('type') == "wordCloud":
                 temple = Tp._temple_wd
                 break
+            if s.get('type') == "liquidFill":
+                temple = Tp._temple_lq
+                break
             if s.get('type') in ("scatter", "pie", "bar", "line") and 'coordinateSystem' not in s:
                 temple = Tp.temple
                 break
@@ -230,8 +238,12 @@ def render(self, path="render.html"):
             .replace("myOption", my_option)\
             .replace("myWidth", str(self._width))\
             .replace("myHeight", str(self._height))
-        with open(path, "w+") as f:
-            f.write(__op)
+        try:        # for Python3
+            with open(path, "w+", encoding="utf-8") as fout:
+                fout.write(__op)
+        except:     # for Python2
+            with open(path, "w+") as fout:
+                fout.write(__op)
 
     @property
     def _geo_cities(self):

diff --git a/pyecharts/charts/__init__.py b/pyecharts/charts/__init__.py
@@ -1,3 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-#coding=utf-8

diff --git a/pyecharts/charts/bar.py b/pyecharts/charts/bar.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.base import Base

diff --git a/pyecharts/charts/effectscatter.py b/pyecharts/charts/effectscatter.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.charts.scatter import Scatter

diff --git a/pyecharts/charts/funnel.py b/pyecharts/charts/funnel.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.base import Base

diff --git a/pyecharts/charts/gauge.py b/pyecharts/charts/gauge.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.base import Base

diff --git a/pyecharts/charts/geo.py b/pyecharts/charts/geo.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.base import Base
@@ -33,7 +32,7 @@ def __add(self, name, attr, value,
         :param value:
             属性所对应的值
         :param type:
-            图例类型，有 scatter/effectscatter 可选
+            图例类型，有'scatter', 'effectscatter'可选
         :param maptype:
             地图类型，目前只有 china 可选
         :param symbol_size:

diff --git a/pyecharts/charts/graph.py b/pyecharts/charts/graph.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.base import Base
@@ -16,7 +15,7 @@ def __init__(self, title="", subtitle="", **kwargs):
     def add(self, *args, **kwargs):
         self.__add(*args, **kwargs)
 
-    def __add(self, nodes, links, categories=None,
+    def __add(self, name, nodes, links, categories=None,
               is_focusnode=True,
               is_roam=True,
               is_rotatelabel=False,
@@ -26,7 +25,8 @@ def __add(self, nodes, links, categories=None,
               repulsion=50,
               **kwargs):
         """
-
+        :param name:
+            图例名称
         :param nodes:
             关系图结点，包含的数据项有
             # 必须！！
@@ -76,6 +76,7 @@ def __add(self, nodes, links, categories=None,
                 self._option.get('legend').get('data').append(c)
         self._option.get('series').append({
             "type": "graph",
+            "name": name,
             "layout": layout,
             "symbol": chart['symbol'],
             "circular": {"rotateLabel": is_rotatelabel},

diff --git a/pyecharts/charts/line.py b/pyecharts/charts/line.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.base import Base

diff --git a/pyecharts/charts/liquid.py b/pyecharts/charts/liquid.py
@@ -0,0 +1,62 @@
+#!/usr/bin/env python
+#coding=utf-8
+
+from pyecharts.base import Base
+
+class Liquid(Base):
+    """
+    <<< 水球图 >>>
+    主要用来突出数据的百分比
+    """
+    def __init__(self, title="", subtitle="", **kwargs):
+        super(Liquid, self).__init__(title, subtitle, **kwargs)
+
+    def add(self, *args, **kwargs):
+        self.__add(*args, **kwargs)
+
+    def __add(self, name, data,
+              shape='circle',
+              liquid_color=None,
+              is_liquid_animation=True,
+              is_liquid_outline_show=True,
+              **kwargs):
+        """
+
+        :param name:
+            图例名称
+        :param data:
+            数据项
+        :param shape:
+            水球外形，有'circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'可选
+        :param liquid_color:
+            波浪颜色
+        :param is_liquid_animation:
+            是否显示波浪动画
+        :param is_liquid_outline_show:
+            是否显示边框
+        :param kwargs:
+        :return:
+        """
+        _animation_dur, _animation_dur_update = 2000, 1000
+        if not is_liquid_animation:
+            _animation_dur, _animation_dur_update = 0, 0
+
+        _color = ['#294D99', '#156ACF', '#1598ED', '#45BDFF']
+        if liquid_color:
+            _color = liquid_color
+
+        _shape = 'circle'
+        if shape in ('circle', 'rect', 'roundRect', 'triangle', 'diamond', 'pin', 'arrow'):
+            _shape = shape
+
+        self._option.get('series').append({
+            "type": "liquidFill",
+            "name": name,
+            "data": data,
+            "waveAnimation": is_liquid_animation,
+            "animationDuration": _animation_dur,
+            "animationDurationUpdate": _animation_dur_update,
+            "color": _color,
+            "shape": _shape,
+            "outline": {"show": is_liquid_outline_show}
+        })
diff --git a/pyecharts/charts/map.py b/pyecharts/charts/map.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 #coding=utf-8
 
 from pyecharts.base import Base
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,9 +8,7 @@ __pycache__/ @@
     .idea
     # Distribution / packaging
     .Python
-    /json/
     /js/
-    /images_/
     env/
     build/
     develop-eggs/
@@ Expand Down @@