diff --git a/index.html b/index.html
index 0a1fa45..3d1e7b8 100644
--- a/index.html
+++ b/index.html
@@ -11,165 +11,205 @@
     <div id="tempdiv" style="width: 100%; height:50%"></div>
     <div id="humiddiv" style="width: 100%; height:50%"></div>
     <script>
+    var colorss =
+        ["#FF6600", "#FCD202", "#309E09", "#0D8ECF", "#2A0CD0",
+         "#CD0D74", "#CC0000", "#00CC00", "#0000CC", "#DDDDDD",
+         "#999999", "#333333", "#990000", "#a0ee70", "#f0ff00",] ;
     var tempchart= AmCharts.makeChart("tempdiv", {
-		    "type": "serial",
-		    "dataProvider": data,
-		    "categoryField": "datetime",
-		    "chartScrollbar": {
-		      "autoGridCount": true,
-		      "graph": "tempscale",
-		      "selectedGraphLineAlpha": 1,
-		      "selectedGraphFillAlpha": 0,
-		      "selectedBackgroundColor": "#c0d0e0",
-		      "graphLineAlpha": 1,
-		      "graphFillAlpha": 0,
-		      "scrollbarHeight": 30
-		    },
-		    "categoryAxis": {
-		      "parseDates": true,
-		      "minPeriod": "mm",
-              "labelsEnabled": false,
-		    },
-            "listeners": [{
+        "type": "serial",
+        "dataProvider": data,
+        "categoryField": "datetime",
+        "valueAxis": {
+            "ignoreAxisWidth": true
+        },
+        "chartScrollbar": {
+            "autoGridCount": true,
+            "graph": "tempscale",
+            "color": "#c0f0e0",
+            "selectedGraphLineAlpha": 1,
+            "selectedGraphFillAlpha": 0,
+            "selectedBackgroundColor": "#c0d0e0",
+            "graphLineAlpha": 1,
+            "graphFillAlpha": 0,
+            "scrollbarHeight": 30
+        },
+        "categoryAxis": {
+            "parseDates": true,
+            "minPeriod": "mm",
+            "labelsEnabled": false,
+        },
+        "listeners": [{
                 "event": "zoomed",
                 "method": syncZoom
-	    }, {
-		"event": "init",
-		"method": 
-		function() {
-		    today = new Date();
-		    tempchart.zoomToDates(new Date(today.getTime() - 7*24*3600*1000), today);
-		}
-    	    }
-			],
-		    "chartCursor": {
-              "listeners": [{
-                  "event": "changed",
-                  "method": syncCursors
-              }, {
-                  "event": "onHideCursor",
-                  "method": hideCursors
-              }],
-              "oneBalloonOnly": true,
-		      "cursorPosition": "mouse",
-		      "valueLineEnabled": true,
-		      "categoryBalloonEnabled": false,
-		      "valueBalloonFormat": "%d"
-		    },
-		    "mouseWheelZoomEnabled": true,
-		    "legend": {
-			    "valueText": "[[value]]℃",
-			    "position": "left"
-		    },
-		    "graphs": [
-		    {"type":"line", "valueField": "temp-1", "title": "01",
-			    "balloonText": "<b>01: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-2", "title": "02",
-			    "balloonText": "<b>02: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-4", "title": "04",
-			    "balloonText": "<b>03: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-8", "title": "8 outside",
-			    "balloonText": "<b>08 out: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-11", "title": "11",
-			    "balloonText": "<b>11: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-12", "title": "12",
-			    "balloonText": "<b>12: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-13", "title": "13",
-			    "balloonText": "<b>13: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-14", "title": "14",
-			    "balloonText": "<b>14: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-15", "title": "15",
-			    "balloonText": "<b>15: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-16", "title": "16",
-			    "balloonText": "<b>16: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-17", "title": "17",
-			    "balloonText": "<b>17: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-18", "title": "18",
-			    "balloonText": "<b>18: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-19", "title": "19",
-			    "balloonText": "<b>19: [[value]]℃</b>", },
-		    {"type":"line", "valueField": "temp-20",
-			    "balloonText": "<b>20 out: [[value]]℃</b>",
-			    "title": "20 outside", "id": "tempscale" },
-		    ]
-	    });
+            }, {
+                "event": "init",
+                "method": 
+                function() {
+                    var today = new Date();
+                    var weekbefore = today.getTime - 7* 24*3600*1000;
+                    console.log(new Date(weekbefore) + "  -  " + today);
+                    tempchart.zoomToDates(new Date(weekbefore), today);
+                }
+        }],
+        "chartCursor": {
+            "listeners": [{
+                "event": "changed",
+                "method": syncCursors
+            }, {
+                "event": "onHideCursor",
+                "method": hideCursors
+            }],
+            "oneBalloonOnly": true,
+            "cursorPosition": "mouse",
+            "valueLineEnabled": true,
+            "categoryBalloonEnabled": false,
+            "valueBalloonFormat": "%d"
+        },
+        "mouseWheelZoomEnabled": true,
+        "legend": {
+            "rollOverColor": "#104090",
+            "valueText": "[[value]]℃",
+	    "verticalGap": 6,
+            "position": "left",
+            "rollOverGraphAlpha": 0.2,
+        },
+            /*
+    # group : I->ist, R->HSJ-R, L->HSJ-L, O->outside, H->kousaku, F->field-Lab
+    {   title => 'out', dir   => '8', # sensor no.  group => 'O', },
+    {   title => 'out2', dir   => '20', group => 'O', },
+    {   title => 'win', dir   => '15', group => 'O', },
+    {   title => 'ent', dir   => '1', group => 'H', },
+    {   title => '3D', dir   => '6', group => 'H', },
+    {   title => 'fun', dir   => '7', group => 'H', },
+    {   title => 'RF', dir   => '5', group => 'R', },
+    {   title => 'RC', dir   => '10', group => 'R', },
+    {   title => 'RB', dir   => '4', group => 'R', },
+    {   title => 'LF', dir   => '3', group => 'L', },
+    {   title => 'LC', dir   => '9', group => 'L', },
+    {   title => 'LB', dir   => '2', group => 'L', },
+    {   title => 'GRL', dir   => '14', group => 'I', },
+    {   title => 'ML1', dir   => '13', group => 'I', },
+    {   title => 'ML2', dir   => '12', group => 'I', },
+    {   title => 'F1', dir   => '18', group => 'F', },
+    {   title => 'F2', dir   => '17', group => 'F', },
+    {   title => 'F3', dir   => '16', group => 'F', },
+    {   title => 'ist', dir   => '11', group => 'I', },
+    {   title => 'SRV', dir   => '19', group => 'I', }, */
+        "colors": colorss,
+        "graphs": [
+            {"type":"line", "valueField": "temp-1", "title": "01 ent H",
+                "balloonText": "<b>01 ent: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-2", "title": "02 LB L",
+                "balloonText": "<b>02 LB: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-4", "title": "04 RB R",
+                "balloonText": "<b>04 RB: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-11", "title": "11 ist準備",
+                "balloonText": "<b>11 ist: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-12", "title": "12 ML2",
+                "balloonText": "<b>12 ML2: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-13", "title": "13 ML1",
+                "balloonText": "<b>13 ML1: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-14", "title": "14 GRL",
+                "balloonText": "<b>14 GRL: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-19", "title": "19 サーバ",
+                "balloonText": "<b>19 サーバ: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-16", "title": "16 領域3 F",
+                "balloonText": "<b>16 領域3: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-17", "title": "17 領域2 F",
+                "balloonText": "<b>17 領域2: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-18", "title": "18 領域1 F",
+                "balloonText": "<b>18 領域1: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-15", "title": "15 win O",
+                "balloonText": "<b>15 win: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-8", "title": "08 out",
+                "balloonText": "<b>08 out: [[value]]℃</b>", },
+            {"type":"line", "valueField": "temp-20",
+                "balloonText": "<b>20 out: [[value]]℃</b>",
+                "title": "20 out", "id": "tempscale" },
+        ]
+        });
 
     var humidchart = AmCharts.makeChart("humiddiv", {
-		    "type": "serial",
-		    "dataProvider": data,
-		    "categoryField": "datetime",
-            "valueAxis": {
-	        "maximum": "99",
-                "ignoreAxisWidth": true
-            },
+        "type": "serial",
+        "dataProvider": data,
+        "categoryField": "datetime",
+        "valueAxis": {
+            "fontSize": 4
+        },
+        "listeners": [{
+            "event": "zoomed",
+            "method": syncZoom
+        }, {
+            "event": "init",
+            "method": 
+                function() {
+                    today = new Date();
+                    humidchart.zoomToDates(new Date(today.getTime() - 7*24*3600*1000), today);
+                }
+        }
+        ],
+        "chartCursor": {
+            "oneBalloonOnly": true,
+            "cursorPosition": "mouse",
+            "valueLineEnabled": true,
+            "categoryBalloonDateFormat": "MMM DD, YYYY JJ:NN",
             "listeners": [{
-                "event": "zoomed",
-                "method": syncZoom
-	    }, {
-		"event": "init",
-		"method": 
-		function() {
-		    today = new Date();
-		    humidchart.zoomToDates(new Date(today.getTime() - 7*24*3600*1000), today);
-		}
-    	    }
-            ],
-		    "chartCursor": {
-              "oneBalloonOnly": true,
-		      "cursorPosition": "mouse",
-		      "valueLineEnabled": true,
-		      "categoryBalloonDateFormat": "MMM DD, YYYY JJ:NN",
-              "listeners": [{
-                  "event": "changed",
-                  "method": syncCursors
-              }, {
-                  "event": "onHideCursor",
-                  "method": hideCursors
-              }]
-		    },
-		    "categoryAxis": {
-		      "parseDates": true,
-		      "minPeriod": "mm",
-		      "labelRotation": 25
-		    },
-		    "mouseWheelZoomEnabled": true,
-		    "legend": {
-			    "valueText": "[[value]]%",
-			    "position": "left"
-		    },
-		    "graphs": [
-		      {"type":"line", "valueField": "humid-1", "title": "01",
-			    "balloonText": "<b>01: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-2", "title": "02",
-			    "balloonText": "<b>02: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-4", "title": "04",
-			    "balloonText": "<b>04: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-8", "title": "08 outside",
-			    "balloonText": "<b>08 out : [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-11", "title": "11",
-			    "balloonText": "<b>11: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-12", "title": "12",
-			    "balloonText": "<b>12: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-13", "title": "13",
-			    "balloonText": "<b>13: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-14", "title": "14",
-			    "balloonText": "<b>14: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-15", "title": "15",
-			    "balloonText": "<b>15: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-16", "title": "16",
-			    "balloonText": "<b>16: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-17", "title": "17",
-			    "balloonText": "<b>17: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-18", "title": "18",
-			    "balloonText": "<b>18: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-19", "title": "19",
-			    "balloonText": "<b>19: [[value]]%</b>"},
-		      {"type":"line", "valueField": "humid-20",
-			    "balloonText": "<b>20 out: [[value]]%</b>",
-			      "title": "20 outside", "id": "humidscale"
-		       },
-		    ]
-	    });
+                "event": "changed",
+                "method": syncCursors
+            }, {
+                "event": "onHideCursor",
+                "method": hideCursors
+            }]
+        },
+        "categoryAxis": {
+            "color": "#205020",
+            "fillColor": "#40a090",
+            "parseDates": true,
+            "minPeriod": "mm",
+            "labelRotation": 25
+        },
+        "mouseWheelZoomEnabled": true,
+        "legend": {
+            "rollOverColor": "#00f0f0",
+            "valueText": "[[value]]%",
+	    "verticalGap": 6,
+            "position": "left",
+            "rollOverGraphAlpha": 0.2,
+        },
+        "colors": colorss,
+        "graphs": [
+            {"type":"line", "valueField": "humid-1", "title": "01 ent H",
+                "balloonText": "<b>01 ent: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-2", "title": "02 LB L",
+                "balloonText": "<b>02 LB: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-4", "title": "04 RB R",
+                "balloonText": "<b>04 RB: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-11", "title": "11 ist",
+                "balloonText": "<b>11 ist: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-12", "title": "12 ML2",
+                "balloonText": "<b>12 ML2: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-13", "title": "13 ML1",
+                "balloonText": "<b>13 ML1: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-14", "title": "14 GRL",
+                "balloonText": "<b>14 GRL: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-19", "title": "19 サーバ",
+                "balloonText": "<b>19 サーバ: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-16", "title": "16 領域3",
+                "balloonText": "<b>16 領域3: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-17", "title": "17 領域2",
+                "balloonText": "<b>17 領域2: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-18", "title": "18 領域1",
+                "balloonText": "<b>18 領域1: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-15", "title": "15 win O",
+                "balloonText": "<b>15 win: [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-8", "title": "08 out",
+                "balloonText": "<b>08 out : [[value]]%</b>"},
+            {"type":"line", "valueField": "humid-20",
+                "balloonText": "<b>20 out: [[value]]%</b>",
+                "title": "20 out", "id": "humidscale"
+            },
+        ]
+    });
 
     function syncCursors(e) {
         if(tempchart !== e.chart) {
@@ -190,10 +230,9 @@
     }
 
     function syncZoom(e) {
-	console.log(e.startDate + "|" + e.endDate);
         if (e.chart.ignoreZoom) {
-		e.chart.ignoreZoom = false;
-		return;
+        e.chart.ignoreZoom = false;
+        return;
         }
         if(tempchart !== e.chart) {
             tempchart.ignoreZoom = true;
@@ -203,6 +242,46 @@
             humidchart.zoomToDates(e.startDate, e.endDate);
         }
     }
+
+    function toggle_graphs(state,chart) {
+        function inner(i, args) {
+            if (i < args.length-1) {
+                setTimeout(function() {inner(i+1, args);}, 0);
+            }
+            if (state) {
+                tempchart.showGraph(tempchart.graphs[args[i]]);
+                humidchart.showGraph(humidchart.graphs[args[i]]);
+            } else {
+                tempchart.hideGraph(tempchart.graphs[args[i]]);
+                humidchart.hideGraph(humidchart.graphs[args[i]]);
+            }
+        }
+        inner(1, arguments);
+    }
+
+
+    window.onkeydown = function(e) {
+        switch (e.keyCode) {
+            case 191:
+                alert("?\thelp\ni\tIST\t\t(toggle)\nh\tHSJ\t\t(toggle)\nf\tField\t(toggle)\no\toutside\t(toggle)");
+                break;
+            case 73:
+                toggle_graphs(tempchart.graphs[3].hidden, 3,4,5,6,7);
+                break;
+            case 72:
+                toggle_graphs(tempchart.graphs[0].hidden, 0,1,2);
+                break;
+            case 70:
+                toggle_graphs(tempchart.graphs[8].hidden, 8,9,10);
+                break;
+            case 79:
+                toggle_graphs(tempchart.graphs[11].hidden, 11,12,13);
+                break;
+            default:
+                console.log(e.keyCode);
+                break;
+        }
+    };
     </script>
 </body>
 </html>
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