Added candlesticks plots and used them where possible. Also added SVG
plots for old years.
This commit is contained in:
parent
abce30d5fa
commit
0bbccbdd73
12
_graph_templates/2009.svg.xml
Normal file
12
_graph_templates/2009.svg.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<graph xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
<size>600, 600</size>
|
||||
<xi:include href="includes/format_svg.xml" parse="xml" />
|
||||
<start>year=2009, month=1, day=1, hour=0</start>
|
||||
<stop>year=2009, month=12, day=31, hour=23</stop>
|
||||
<xformat>%b</xformat>
|
||||
<xlabel>%Y</xlabel>
|
||||
<dateformat></dateformat>
|
||||
<xi:include href="includes/monthly_temp_candle.xml" parse="xml" />
|
||||
<xi:include href="includes/monthly_rain_sum_dual.xml" parse="xml" />
|
||||
</graph>
|
12
_graph_templates/2010.svg.xml
Normal file
12
_graph_templates/2010.svg.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<graph xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
<size>600, 600</size>
|
||||
<xi:include href="includes/format_svg.xml" parse="xml" />
|
||||
<start>year=2010, month=1, day=1, hour=0</start>
|
||||
<stop>year=2010, month=12, day=31, hour=23</stop>
|
||||
<xformat>%b</xformat>
|
||||
<xlabel>%Y</xlabel>
|
||||
<dateformat></dateformat>
|
||||
<xi:include href="includes/monthly_temp_candle.xml" parse="xml" />
|
||||
<xi:include href="includes/monthly_rain_sum_dual.xml" parse="xml" />
|
||||
</graph>
|
12
_graph_templates/2011.svg.xml
Normal file
12
_graph_templates/2011.svg.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<graph xmlns:xi="http://www.w3.org/2001/XInclude">
|
||||
<size>600, 600</size>
|
||||
<xi:include href="includes/format_svg.xml" parse="xml" />
|
||||
<start>year=2011, month=1, day=1, hour=0</start>
|
||||
<stop>year=2011, month=12, day=31, hour=23</stop>
|
||||
<xformat>%b</xformat>
|
||||
<xlabel>%Y</xlabel>
|
||||
<dateformat></dateformat>
|
||||
<xi:include href="includes/monthly_temp_candle.xml" parse="xml" />
|
||||
<xi:include href="includes/monthly_rain_sum_dual.xml" parse="xml" />
|
||||
</graph>
|
@ -7,6 +7,6 @@
|
||||
<xformat>%b</xformat>
|
||||
<xlabel>%Y</xlabel>
|
||||
<dateformat></dateformat>
|
||||
<xi:include href="includes/monthly_temp_maxmin_bar.xml" parse="xml" />
|
||||
<xi:include href="includes/monthly_temp_candle.xml" parse="xml" />
|
||||
<xi:include href="includes/monthly_rain_sum_dual.xml" parse="xml" />
|
||||
</graph>
|
||||
|
@ -7,6 +7,6 @@
|
||||
<xformat>%b</xformat>
|
||||
<xlabel>%Y</xlabel>
|
||||
<dateformat></dateformat>
|
||||
<xi:include href="includes/monthly_temp_maxmin_bar.xml" parse="xml" />
|
||||
<xi:include href="includes/monthly_temp_candle.xml" parse="xml" />
|
||||
<xi:include href="includes/monthly_rain_sum_dual.xml" parse="xml" />
|
||||
</graph>
|
||||
|
@ -5,7 +5,7 @@
|
||||
<duration>weeks=4</duration>
|
||||
<xformat>%Y/%m/%d</xformat>
|
||||
<dateformat></dateformat>
|
||||
<xi:include href="includes/daily_temp_maxmin_bar.xml" parse="xml" />
|
||||
<xi:include href="includes/daily_temp_candle.xml" parse="xml" />
|
||||
<xi:include href="includes/hourly_wind_gust_line.xml" parse="xml" />
|
||||
<xi:include href="includes/daily_rain_sum_dual.xml" parse="xml" />
|
||||
<xi:include href="includes/hourly_press_line.xml" parse="xml" />
|
||||
|
@ -5,7 +5,7 @@
|
||||
<duration>weeks=4</duration>
|
||||
<xformat>%Y/%m/%d</xformat>
|
||||
<dateformat></dateformat>
|
||||
<xi:include href="includes/daily_temp_maxmin_bar.xml" parse="xml" />
|
||||
<xi:include href="includes/daily_temp_candle.xml" parse="xml" />
|
||||
<xi:include href="includes/hourly_wind_gust_line.xml" parse="xml" />
|
||||
<xi:include href="includes/daily_rain_sum_dual.xml" parse="xml" />
|
||||
<xi:include href="includes/hourly_press_line.xml" parse="xml" />
|
||||
|
24
_graph_templates/includes/daily_temp_candle.xml
Normal file
24
_graph_templates/includes/daily_temp_candle.xml
Normal file
@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<plot>
|
||||
<title>Temperatur (℃)</title>
|
||||
<yrange>-20, 50</yrange>
|
||||
<grid>ytics</grid>
|
||||
<source>daily</source>
|
||||
<subplot>
|
||||
<!-- Candlesticks plot with whiskerbars, line width: 2, whiskerbar width: 50% -->
|
||||
<style>candlesticks 2</style>
|
||||
<colour>rgb "#f44336"</colour>
|
||||
<xcalc>data['start'] + timedelta(hours=12)</xcalc>
|
||||
<!-- 4 values as tuple in that order: NightAvg, NightMin, DayMax, DayAvg -->
|
||||
<ycalc>(data['temp_out_min'], data['temp_out_min'], data['temp_out_max'], data['temp_out_max'])</ycalc>
|
||||
</subplot>
|
||||
<subplot>
|
||||
<!-- This is the median line as per gnuplot documentation -->
|
||||
<style>candlesticks 1.5</style>
|
||||
<colour>rgb "#607d8b"</colour>
|
||||
<xcalc>data['start'] + timedelta(hours=12)</xcalc>
|
||||
<!-- 4 times the same value as we don't want a bar but only a line -->
|
||||
<ycalc>(data['temp_out_ave'], data['temp_out_ave'], data['temp_out_ave'], data['temp_out_ave'])</ycalc>
|
||||
</subplot>
|
||||
</plot>
|
||||
|
24
_graph_templates/includes/monthly_temp_candle.xml
Normal file
24
_graph_templates/includes/monthly_temp_candle.xml
Normal file
@ -0,0 +1,24 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<plot>
|
||||
<title>Temperatur (℃)</title>
|
||||
<yrange>-20, 50</yrange>
|
||||
<grid>ytics</grid>
|
||||
<source>monthly</source>
|
||||
<subplot>
|
||||
<!-- Candlesticks plot with whiskerbars, line width: 2, whiskerbar width: 50% -->
|
||||
<style>candlesticksw 2 0.5</style>
|
||||
<colour>rgb "#f44336"</colour>
|
||||
<xcalc>data['start'] + timedelta(days=15)</xcalc>
|
||||
<!-- 4 values as tuple in that order: NightAvg, NightMin, DayMax, DayAvg -->
|
||||
<ycalc>(data['temp_out_min_ave'], data['temp_out_min_lo'], data['temp_out_max_hi'], data['temp_out_max_ave'])</ycalc>
|
||||
</subplot>
|
||||
<subplot>
|
||||
<!-- This is the median line as per gnuplot documentation -->
|
||||
<style>candlesticks 1.5</style>
|
||||
<colour>rgb "#607d8b"</colour>
|
||||
<xcalc>data['start'] + timedelta(days=15)</xcalc>
|
||||
<!-- 4 times the same value as we don't want a bar but only a line -->
|
||||
<ycalc>(data['temp_out_ave'], data['temp_out_ave'], data['temp_out_ave'], data['temp_out_ave'])</ycalc>
|
||||
</subplot>
|
||||
</plot>
|
||||
|
Reference in New Issue
Block a user