diff --git a/_graph_templates/24hrs.png.xml b/_graph_templates/24hrs.png.xml index d6a694d..806b38c 100644 --- a/_graph_templates/24hrs.png.xml +++ b/_graph_templates/24hrs.png.xml @@ -8,6 +8,6 @@ <dateformat></dateformat> <xi:include href="includes/raw_temp_dew_line.xml" parse="xml" /> <xi:include href="includes/raw_wind_gust_line.xml" parse="xml" /> - <xi:include href="includes/hourly_rain_bar.xml" parse="xml" /> + <xi:include href="includes/hourly_rain_sum_dual.xml" parse="xml" /> <xi:include href="includes/hourly_press_line.xml" parse="xml" /> </graph> diff --git a/_graph_templates/24hrs.svg.xml b/_graph_templates/24hrs.svg.xml index c4a380b..ff7423f 100644 --- a/_graph_templates/24hrs.svg.xml +++ b/_graph_templates/24hrs.svg.xml @@ -8,6 +8,6 @@ <dateformat></dateformat> <xi:include href="includes/raw_temp_dew_line.xml" parse="xml" /> <xi:include href="includes/raw_wind_gust_line.xml" parse="xml" /> - <xi:include href="includes/hourly_rain_bar.xml" parse="xml" /> + <xi:include href="includes/hourly_rain_sum_dual.xml" parse="xml" /> <xi:include href="includes/hourly_press_line.xml" parse="xml" /> </graph> diff --git a/_graph_templates/28days.png.xml b/_graph_templates/28days.png.xml index fc6a17d..95e08d1 100644 --- a/_graph_templates/28days.png.xml +++ b/_graph_templates/28days.png.xml @@ -7,6 +7,6 @@ <dateformat></dateformat> <xi:include href="includes/daily_temp_maxmin_bar.xml" parse="xml" /> <xi:include href="includes/hourly_wind_gust_line.xml" parse="xml" /> - <xi:include href="includes/daily_rain_bar.xml" parse="xml" /> + <xi:include href="includes/daily_rain_sum_dual.xml" parse="xml" /> <xi:include href="includes/hourly_press_line.xml" parse="xml" /> </graph> diff --git a/_graph_templates/28days.svg.xml b/_graph_templates/28days.svg.xml index 739fb5e..a9b3448 100644 --- a/_graph_templates/28days.svg.xml +++ b/_graph_templates/28days.svg.xml @@ -7,6 +7,6 @@ <dateformat></dateformat> <xi:include href="includes/daily_temp_maxmin_bar.xml" parse="xml" /> <xi:include href="includes/hourly_wind_gust_line.xml" parse="xml" /> - <xi:include href="includes/daily_rain_bar.xml" parse="xml" /> + <xi:include href="includes/daily_rain_sum_dual.xml" parse="xml" /> <xi:include href="includes/hourly_press_line.xml" parse="xml" /> </graph> diff --git a/_graph_templates/7days.png.xml b/_graph_templates/7days.png.xml index 0fc1b53..27bcee3 100644 --- a/_graph_templates/7days.png.xml +++ b/_graph_templates/7days.png.xml @@ -7,6 +7,6 @@ <dateformat></dateformat> <xi:include href="includes/hourly_temp_dew_line.xml" parse="xml" /> <xi:include href="includes/hourly_wind_gust_line.xml" parse="xml" /> - <xi:include href="includes/hourly_rain_bar.xml" parse="xml" /> + <xi:include href="includes/hourly_rain_sum_dual.xml" parse="xml" /> <xi:include href="includes/hourly_press_line.xml" parse="xml" /> </graph> diff --git a/_graph_templates/7days.svg.xml b/_graph_templates/7days.svg.xml index df31637..fad0703 100644 --- a/_graph_templates/7days.svg.xml +++ b/_graph_templates/7days.svg.xml @@ -7,6 +7,6 @@ <dateformat></dateformat> <xi:include href="includes/hourly_temp_dew_line.xml" parse="xml" /> <xi:include href="includes/hourly_wind_gust_line.xml" parse="xml" /> - <xi:include href="includes/hourly_rain_bar.xml" parse="xml" /> + <xi:include href="includes/hourly_rain_sum_dual.xml" parse="xml" /> <xi:include href="includes/hourly_press_line.xml" parse="xml" /> </graph> diff --git a/_graph_templates/includes/daily_rain_bar.xml b/_graph_templates/includes/daily_rain_bar.xml index 32da6e1..9dad6b7 100644 --- a/_graph_templates/includes/daily_rain_bar.xml +++ b/_graph_templates/includes/daily_rain_bar.xml @@ -7,6 +7,6 @@ <style>box</style> <xcalc>data['start'] + timedelta(hours=12)</xcalc> <ycalc>data['rain']</ycalc> - <title>Tägl. Regenfall (㎜)</title> + <title>Tägl. Niederschlag (㎜)</title> </subplot> </plot> diff --git a/_graph_templates/includes/daily_rain_sum_dual.xml b/_graph_templates/includes/daily_rain_sum_dual.xml new file mode 100644 index 0000000..bf8fcac --- /dev/null +++ b/_graph_templates/includes/daily_rain_sum_dual.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> + <plot> + <title>Niederschlag (㎜)</title> + <yrange>0, 30</yrange> + <y2range>0, 120</y2range> + <ylabel>täglich</ylabel> + <y2label>gesamt</y2label> + <source>daily</source> + <subplot> + <colour>rgb "#2196f3"</colour> + <style>box</style> + <xcalc>data['start'] + timedelta(hours=12)</xcalc> + <ycalc>data['rain']</ycalc> + <title>täglich</title> + </subplot> + <subplot> + <colour>rgb "#283593"</colour> + <axes>x1y2</axes> + <ycalc>data['rain'] + last_ycalc</ycalc> + <title>gesamt</title> + </subplot> + </plot> diff --git a/_graph_templates/includes/hourly_rain_bar.xml b/_graph_templates/includes/hourly_rain_bar.xml index 52cb9ce..d7942ab 100644 --- a/_graph_templates/includes/hourly_rain_bar.xml +++ b/_graph_templates/includes/hourly_rain_bar.xml @@ -7,6 +7,6 @@ <style>box</style> <xcalc>data['idx'].replace(minute=30, second=0)</xcalc> <ycalc>data['rain']</ycalc> - <title>Regenfall (㎜)</title> + <title>Niederschlag (㎜)</title> </subplot> </plot> diff --git a/_graph_templates/includes/hourly_rain_sum_dual.xml b/_graph_templates/includes/hourly_rain_sum_dual.xml index d88c4f1..26340cd 100644 --- a/_graph_templates/includes/hourly_rain_sum_dual.xml +++ b/_graph_templates/includes/hourly_rain_sum_dual.xml @@ -1,10 +1,9 @@ <?xml version="1.0" encoding="utf-8"?> <plot> - <bmargin>1.6</bmargin> <title>Niederschlag (㎜)</title> <yrange>0, 6</yrange> <y2range>0, 30</y2range> - <ylabel>stündl.</ylabel> + <ylabel>stündlich</ylabel> <y2label>gesamt</y2label> <source>hourly</source> <subplot> @@ -12,7 +11,7 @@ <style>box</style> <xcalc>data['idx'].replace(minute=30, second=0)</xcalc> <ycalc>data['rain']</ycalc> - <title>stündl.</title> + <title>stündlich</title> </subplot> <subplot> <colour>rgb "#283593"</colour> diff --git a/_graph_templates/includes/monthly_rain_bar.xml b/_graph_templates/includes/monthly_rain_bar.xml index 6e3b6c8..b6d285e 100644 --- a/_graph_templates/includes/monthly_rain_bar.xml +++ b/_graph_templates/includes/monthly_rain_bar.xml @@ -7,6 +7,6 @@ <style>box</style> <xcalc>data['start'] + timedelta(days=14)</xcalc> <ycalc>data['rain']</ycalc> - <title>Monatl. Regenfall (㎜)</title> + <title>Monatl. Niederschlag (㎜)</title> </subplot> </plot>