Release 2016/5/17

ntu-as-cooklab · May 16, 2016 · 25a895d · 25a895d
1 parent 0de43cf
commit 25a895d
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 19 deletions.
diff --git a/cfsr/convert/main.cpp b/cfsr/convert/main.cpp
@@ -6,16 +6,16 @@
 
 int main()
 {
-	SetConsoleOutputCP(65001);
+	SetConsoleOutputCP(950);
 
 	printf(
 	"\n"
-	"*************** csv->CFSR檔案轉換程式 ***************\n"
+	"*************** csv->CFSR檔案轉換程式 ***************\n"
 	"                  2016/5/16\n"
-	"                 En Shih (石恩)\n"
+	"                 En Shih (石恩)\n"
 	"\n\n");
 
-	printf("檔案轉換中，請稍候\n\n");
+	printf("檔案轉換中，請稍候... ...\n\n");
 
 	for (int i=1; i<=12; i++)
 	{
@@ -25,7 +25,7 @@ int main()
 		convertCFSR(CFSR_V, i);
 	}
 
-	printf("檔案轉換完畢\n");
+	printf("檔案轉換完畢\n");
 
 	return 0;
 }
diff --git a/html/index.html b/html/index.html
@@ -143,9 +143,11 @@
 			<div id="controls" onchange="setParam(event.target)" onclick="setParam(event.target)">
 				<div class="hor">
 					<div class="hor">
-						<input type="radio" name="dataset" value="0" checked> 1979~2009 平均資料<br>
-						<input type="radio" name="dataset" value="1" > 1979~2009 連續資料<br>
-						<input type="radio" name="dataset" value="2" checked> 單年資料: <input id="iyear" type="number" name="year" value="1979" min="1979" max="1982" step="3" style="width:8ex">
+						<input type="radio" name="dataset0" value="0" id="dataset_avg" > 1979~2009 平均資料</br>
+						<!-- <input type="radio" name="dataset" value="1" > 1979~2009 連續資料<br> -->
+						<!-- <input type="radio" name="dataset" value="2" > 單年資料: <input id="iyear" type="number" name="year" value="1979" min="1979" max="1982" step="3" style="width:8ex"> -->
+						<input type="radio" name="dataset0" value="3" id="dataset_1979" checked> 單年資料: 1979</br>
+						<input type="radio" name="dataset0" value="4" id="dataset_1982"> 單年資料: 1982</br>
 					</div>
 					<div class="hor">
 						起始日期: <input class="date" id="startdate" type="date" name="startdate" value="1979-01-01" min="1979-01-01" max="1980-12-31" onchange="setDays()">
@@ -177,8 +179,8 @@
 			</div>
 			<div id="outputcontainer">
 				<input type="button" onclick="newRecord()" value="新增專案">
-				<input type="button" onclick="loadRecord()" value="載入專案">
-				<input type="button" onclick="clearRecord()" value="刪除紀錄"></br>
+				<input type="button" onclick="loadRecord()" value="載入專案" hidden>
+				<input type="button" onclick="clearRecord()" value="刪除檔案"></br>
 				專案: <span id="project"></span></br>
 				<div id="outputlist"></div>
 			</div>

diff --git a/html/src/main.js b/html/src/main.js
@@ -1,6 +1,6 @@
 "use strict";
 
-var container, controls, info, outputlist, doConnect, icolor, iyear, heading, project;
+var container, controls, info, outputlist, doConnect, icolor, iyear, heading, project, dataset_avg, dataset_1979, dataset_1982;
 var startdate, enddate, days;
 var wsClient;
 var voyage = [];
@@ -21,6 +21,10 @@ function main()
 	heading 	= document.getElementById("heading");
 	project 	= document.getElementById("project");
 
+	dataset_avg 	= document.getElementById("dataset_avg");
+	dataset_1979 	= document.getElementById("dataset_1979");
+	dataset_1982 	= document.getElementById("dataset_1982");
+
 	//alert(icolor.value);
 
 	wsClient = new WsClient();
@@ -32,20 +36,38 @@ function main()
 function setParam(e)
 {
 	if(e.name) wsClient.send(e.name + "= " + e.value);
-	if(e == iyear)
-	{
-		startdate.min = e.value + "-01-01";
-		startdate.value = e.value + "-01-01";
-		startdate.max = (e.value+1) + "-12-31";
-		setDays();
-		wsClient.send(startdate.name + "= " + startdate.value);
-	}
+
 	if(e == heading)
 	{
 		if(heading.value<0) heading.value = Number(heading.value) + 360;
 		heading.value = heading.value%360;
 		wsClient.send("dir= " + Math.sin(heading.value*Math.PI/180.0) + " " + Math.cos(heading.value*Math.PI/180.0));
 	}
+
+	var year;
+	if (dataset_avg.checked)
+	{
+		wsClient.send("dataset= 2"); year = 9999;
+	}
+	if (dataset_1979.checked)
+	{
+		wsClient.send("dataset= 2"); year = 1979;
+	}
+	if (dataset_1982.checked)
+	{
+		wsClient.send("dataset= 2"); year = 1982;
+	}
+
+	if(e == dataset_avg || e == dataset_1979 || e == dataset_1982)
+	{
+		startdate.min = year + "-01-01";
+		startdate.value = year + "-01-01";
+		startdate.max = (year+1) + "-12-31";
+		setDays();
+		enddate.min = startdate.value;
+		enddate.max = (year+1) + "-12-31";
+		wsClient.send(startdate.name + "= " + startdate.value);
+	}
 }
 function setStartDate() { setEndDate(); enddate.min = startdate.value; if (new Date(enddate.value).getTime() < new Date(startdate.value).getTime()) enddate.value = startdate.value; setParam(enddate); }
 function setEndDate() { days.value = Math.ceil((new Date(enddate.value).getTime() - new Date(startdate.value).getTime())/86400000); setParam(days); }
@@ -72,4 +94,12 @@ function newRecord()
         project.innerHTML = projectName;
 		wsClient.send("project= " + projectName);
     }
+
+	for (var n=0; n<voyage.length; n++)
+	{
+		map.removeLayer(voyage[n].layerGroup);
+		voyage[n].deleted = true;
+		var item = document.getElementById("outputitem"+n);
+		if(item) item.parentNode.removeChild(item);
+	}
 }