Skip to content

Commit

Permalink
Update some config (pyecharts#1236)
Browse files Browse the repository at this point in the history 
* update some config.

* format code.

* format code.

* add test code.

* add test and example.

* format code.

* A letter was deleted by mistake.

* add a config parameter at liquid and update test code.
  • Loading branch information
@sunhailin-Leo @chenjiandongx
sunhailin-Leo authored and chenjiandongx committed Jul 12, 2019
1 parent 31281fb commit c823706
Show file tree
Hide file tree
Showing 24 changed files with 439 additions and 41 deletions.
2 changes: 1 addition & 1 deletion example/bar_example.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def bar_base_with_custom_background_image() -> Bar:
)
c.add_js_funcs(
"""
var img = new Image(); mg.src = 'https://s2.ax1x.com/2019/07/08/ZsS0fK.jpg';
var img = new Image(); img.src = 'https://s2.ax1x.com/2019/07/08/ZsS0fK.jpg';
"""
)
return c
Expand Down
223 changes: 222 additions & 1 deletion example/grid_example.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
from typing import List, Union

from example.commons import Collector, Faker
from pyecharts import options as opts
from pyecharts.charts import Bar, Grid, Line, Page, Scatter
from pyecharts.charts import Bar, Grid, Line, Kline, Page, Scatter

C = Collector()

Expand Down Expand Up @@ -146,4 +148,223 @@ def grid_mutil_yaxis() -> Grid:
)


@C.funcs
def kline_profession_example() -> Grid:

data = [
[2320.26, 2320.26, 2287.3, 2362.94],
[2300, 2291.3, 2288.26, 2308.38],
[2295.35, 2346.5, 2295.35, 2345.92],
[2347.22, 2358.98, 2337.35, 2363.8],
[2360.75, 2382.48, 2347.89, 2383.76],
[2383.43, 2385.42, 2371.23, 2391.82],
[2377.41, 2419.02, 2369.57, 2421.15],
[2425.92, 2428.15, 2417.58, 2440.38],
[2411, 2433.13, 2403.3, 2437.42],
[2432.68, 2334.48, 2427.7, 2441.73],
[2430.69, 2418.53, 2394.22, 2433.89],
[2416.62, 2432.4, 2414.4, 2443.03],
[2441.91, 2421.56, 2418.43, 2444.8],
[2420.26, 2382.91, 2373.53, 2427.07],
[2383.49, 2397.18, 2370.61, 2397.94],
[2378.82, 2325.95, 2309.17, 2378.82],
[2322.94, 2314.16, 2308.76, 2330.88],
[2320.62, 2325.82, 2315.01, 2338.78],
[2313.74, 2293.34, 2289.89, 2340.71],
[2297.77, 2313.22, 2292.03, 2324.63],
[2322.32, 2365.59, 2308.92, 2366.16],
[2364.54, 2359.51, 2330.86, 2369.65],
[2332.08, 2273.4, 2259.25, 2333.54],
[2274.81, 2326.31, 2270.1, 2328.14],
[2333.61, 2347.18, 2321.6, 2351.44],
[2340.44, 2324.29, 2304.27, 2352.02],
[2326.42, 2318.61, 2314.59, 2333.67],
[2314.68, 2310.59, 2296.58, 2320.96],
[2309.16, 2286.6, 2264.83, 2333.29],
[2282.17, 2263.97, 2253.25, 2286.33],
[2255.77, 2270.28, 2253.31, 2276.22],
]

def calculate_ma(day_count: int, d):
result: List[Union[float, str]] = []
for i in range(len(d)):
if i < day_count:
result.append("-")
continue
sum_total = 0.0
for j in range(day_count):
sum_total += float(d[i - j][1])
result.append(abs(float("%.3f" % (sum_total / day_count))))
return result

x_data = ["2017-7-{}".format(i + 1) for i in range(31)]

kline = (
Kline()
.add_xaxis(xaxis_data=x_data)
.add_yaxis(
series_name="Dow-Jones index",
y_axis=data,
itemstyle_opts=opts.ItemStyleOpts(color="#ec0000", color0="#00da3c"),
)
.set_global_opts(
title_opts=opts.TitleOpts(
title="复杂版 Kline 示例 (Kline + Line + Bar)",
subtitle="MA 就以(2, 4, 6, 8为例)",
),
xaxis_opts=opts.AxisOpts(type_="category"),
yaxis_opts=opts.AxisOpts(
is_scale=True,
splitarea_opts=opts.SplitAreaOpts(
is_show=True, areastyle_opts=opts.AreaStyleOpts(opacity=1)
),
),
legend_opts=opts.LegendOpts(
is_show=False, pos_bottom=10, pos_left="center"
),
datazoom_opts=[
opts.DataZoomOpts(
is_show=False,
type_="inside",
xaxis_index=[0, 1],
range_start=0,
range_end=100,
),
opts.DataZoomOpts(
is_show=True,
xaxis_index=[0, 1],
type_="slider",
pos_top="90%",
range_start=0,
range_end=100,
),
],
tooltip_opts=opts.TooltipOpts(
trigger="axis",
axis_pointer_type="cross",
background_color="rgba(245, 245, 245, 0.8)",
border_width=1,
border_color="#ccc",
textstyle_opts=opts.TextStyleOpts(color="#000"),
),
visualmap_opts=opts.VisualMapOpts(
is_show=False,
dimension=2,
series_index=5,
is_piecewise=True,
pieces=[
{"value": 1, "color": "#ec0000"},
{"value": -1, "color": "#00da3c"},
],
),
axispointer_opts=opts.AxisPointerOpts(
is_show=True,
link=[{"xAxisIndex": "all"}],
label=opts.LabelOpts(background_color="#777"),
),
brush_opts=opts.BrushOpts(
x_axis_index="all",
brush_link="all",
out_of_brush={"colorAlpha": 0.1},
brush_type="lineX",
),
)
)

line = (
Line()
.add_xaxis(xaxis_data=x_data)
.add_yaxis(
series_name="MA2",
y_axis=calculate_ma(day_count=2, d=data),
is_smooth=True,
is_hover_animation=False,
linestyle_opts=opts.LineStyleOpts(width=3, opacity=0.5),
label_opts=opts.LabelOpts(is_show=False),
)
.add_yaxis(
series_name="MA4",
y_axis=calculate_ma(day_count=4, d=data),
is_smooth=True,
is_hover_animation=False,
linestyle_opts=opts.LineStyleOpts(width=3, opacity=0.5),
label_opts=opts.LabelOpts(is_show=False),
)
.add_yaxis(
series_name="MA6",
y_axis=calculate_ma(day_count=6, d=data),
is_smooth=True,
is_hover_animation=False,
linestyle_opts=opts.LineStyleOpts(width=3, opacity=0.5),
label_opts=opts.LabelOpts(is_show=False),
)
.add_yaxis(
series_name="MA8",
y_axis=calculate_ma(day_count=8, d=data),
is_smooth=True,
is_hover_animation=False,
linestyle_opts=opts.LineStyleOpts(width=3, opacity=0.5),
label_opts=opts.LabelOpts(is_show=False),
)
.set_global_opts(xaxis_opts=opts.AxisOpts(type_="category"))
)

bar = (
Bar()
.add_xaxis(xaxis_data=x_data)
.add_yaxis(
series_name="Volume",
yaxis_data=[
[i, data[i][3], 1 if data[i][0] > data[i][1] else -1]
for i in range(len(data))
],
xaxis_index=1,
yaxis_index=1,
label_opts=opts.LabelOpts(is_show=False),
)
.set_global_opts(
xaxis_opts=opts.AxisOpts(
type_="category",
is_scale=True,
grid_index=1,
boundary_gap=False,
axisline_opts=opts.AxisLineOpts(is_on_zero=False),
axistick_opts=opts.AxisTickOpts(is_show=False),
splitline_opts=opts.SplitLineOpts(is_show=False),
axislabel_opts=opts.LabelOpts(is_show=False),
split_number=20,
min_="dataMin",
max_="dataMax",
),
yaxis_opts=opts.AxisOpts(
grid_index=1,
is_scale=True,
split_number=2,
axislabel_opts=opts.LabelOpts(is_show=False),
axisline_opts=opts.AxisLineOpts(is_show=False),
axistick_opts=opts.AxisTickOpts(is_show=False),
splitline_opts=opts.SplitLineOpts(is_show=False),
),
legend_opts=opts.LegendOpts(is_show=False),
)
)

# Kline And Line
overlap_kline_line = kline.overlap(line)

# Grid Overlap + Bar
grid_chart = Grid()
grid_chart.add(
overlap_kline_line,
grid_opts=opts.GridOpts(pos_left="10%", pos_right="8%", height="50%"),
)
grid_chart.add(
bar,
grid_opts=opts.GridOpts(
pos_left="10%", pos_right="8%", pos_top="70%", height="16%"
),
)
return grid_chart


Page().add(*[fn() for fn, _ in C.charts]).render()
36 changes: 35 additions & 1 deletion example/liquid_example.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from example.commons import Collector
from pyecharts import options as opts
from pyecharts.charts import Liquid, Page
from pyecharts.charts import Grid, Liquid, Page
from pyecharts.commons.utils import JsCode
from pyecharts.globals import SymbolType

Expand Down Expand Up @@ -79,4 +79,38 @@ def liquid_shape_rect() -> Liquid:
return c


@C.funcs
def multiple_liquid() -> Grid:
l1 = (
Liquid()
.add("lq", [0.6, 0.7], center=["60%", "50%"])
.set_global_opts(title_opts=opts.TitleOpts(title="多个 Liquid 显示"))
)

l2 = (
Liquid()
.add(
"lq",
[0.3254],
center=["25%", "50%"],
label_opts=opts.LabelOpts(
font_size=50,
formatter=JsCode(
"""function (param) {
return (Math.floor(param.value * 10000) / 100) + '%';
}"""
),
position="inside",
),
)
)

grid = (
Grid()
.add(l1, grid_opts=opts.GridOpts())
.add(l2, grid_opts=opts.GridOpts())
)
return grid


Page().add(*[fn() for fn, _ in C.charts]).render()
2 changes: 2 additions & 0 deletions pyecharts/charts/basic_charts/line.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def add_yaxis(
stack: types.Optional[str] = None,
is_smooth: bool = False,
is_step: bool = False,
is_hover_animation: bool = True,
markpoint_opts: types.MarkPoint = None,
markline_opts: types.MarkLine = None,
tooltip_opts: types.Tooltip = None,
Expand Down Expand Up @@ -56,6 +57,7 @@ def add_yaxis(
"step": is_step,
"stack": stack,
"data": data,
"hoverAnimation": is_hover_animation,
"label": label_opts,
"lineStyle": linestyle_opts,
"areaStyle": areastyle_opts,
Expand Down
3 changes: 3 additions & 0 deletions pyecharts/charts/basic_charts/liquid.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
from ... import types
from ...charts.chart import Chart
from ...globals import ChartType
from ...options.series_options import Numeric


class Liquid(Chart):
Expand All @@ -24,6 +25,7 @@ def add(
color: types.Optional[types.Sequence[str]] = None,
is_animation: bool = True,
is_outline_show: bool = True,
center: types.Sequence = None,
tooltip_opts: types.Tooltip = None,
label_opts: types.Label = opts.LabelOpts(font_size=50, position="inside"),
):
Expand All @@ -46,6 +48,7 @@ def add(
"outline": {"show": is_outline_show},
"tooltip": tooltip_opts,
"label": label_opts,
"center": center
}
)
return self
2 changes: 2 additions & 0 deletions pyecharts/charts/chart.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ def set_global_opts(
visualmap_opts: Union[VisualMapType, Sequence[VisualMapType], None] = None,
datazoom_opts: Union[DataZoomType, Sequence[DataZoomType], None] = None,
graphic_opts: Union[GraphicType, Sequence[GraphicType], None] = None,
axispointer_opts: Union[opts.AxisPointerOpts, dict, None] = None,
):
if tooltip_opts is None:
tooltip_opts = opts.TooltipOpts(
Expand All @@ -123,6 +124,7 @@ def set_global_opts(
visualMap=visualmap_opts,
dataZoom=datazoom_opts,
graphic=graphic_opts,
axisPointer=axispointer_opts,
)

if brush_opts is not None:
Expand Down
Loading

0 comments on commit c823706

Please sign in to comment.