diff --git a/index.html b/index.html
index cf521f1..3d1e7b8 100644
--- a/index.html
+++ b/index.html
@@ -14,7 +14,7 @@
var colorss =
["#FF6600", "#FCD202", "#309E09", "#0D8ECF", "#2A0CD0",
"#CD0D74", "#CC0000", "#00CC00", "#0000CC", "#DDDDDD",
- "#999999", "#333333", "#990000", "#d0ee90", "#f0ff00",] ;
+ "#999999", "#333333", "#990000", "#a0ee70", "#f0ff00",] ;
var tempchart= AmCharts.makeChart("tempdiv", {
"type": "serial",
"dataProvider": data,
@@ -69,6 +69,7 @@
"legend": {
"rollOverColor": "#104090",
"valueText": "[[value]]℃",
+ "verticalGap": 6,
"position": "left",
"rollOverGraphAlpha": 0.2,
},
@@ -171,6 +172,7 @@
"legend": {
"rollOverColor": "#00f0f0",
"valueText": "[[value]]%",
+ "verticalGap": 6,
"position": "left",
"rollOverGraphAlpha": 0.2,
},
diff --git a/merge.py b/merge.py
index f35d00f..bf0e5ac 100644
--- a/merge.py
+++ b/merge.py
@@ -4,11 +4,17 @@
import lzma
result = []
-for i in [1,2,4,8,11,12,13,14,15,16,17,18,19,20]:
+sensorlist = [1,2,4,8,11,12,13,14,15,16,17,18,19,20]
+for i in sensorlist:
no = str(i)
r1 = csv.DictReader(lzma.LZMAFile("/home/tutimura/public_html/cgi-bin/ondotori/data/"+no+"/201612.csv.xz"), fieldnames=["datetime", "temp-"+no, "humid-"+no])
result+=list(r1)
+for i in sensorlist:
+ no = str(i)
+ r1 = csv.DictReader(lzma.LZMAFile("/home/tutimura/public_html/cgi-bin/ondotori/data/"+no+"/201701.csv.xz"), fieldnames=["datetime", "temp-"+no, "humid-"+no])
+ result+=list(r1)
+
#result = sum(result,[]) #flatten list of list
for i in range(len(result)):
result[i]["datetime"] = result[i]["datetime"][:-1]+"0"
@@ -26,5 +32,6 @@
prev = entry["datetime"]
+fa = fa[::2]
print "var data = "
print fa