Release 0.4.2

ntu-as-cooklab · Feb 27, 2017 · 8cb1389 · 8cb1389
1 parent 9afb3be
commit 8cb1389
Show file tree

Hide file tree

Showing 74 changed files with 19 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,4 @@
+[submodule "websocketpp"]
+    path = websocketpp
+    url = git://github.com/zaphoyd/websocketpp.git
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/TODO b/TODO
diff --git a/barnes.cpp.for b/barnes.cpp.for
diff --git a/build.bat b/build.bat
diff --git a/cfsr/CMakeLists.txt b/cfsr/CMakeLists.txt
diff --git a/cfsr/convert/main.cpp b/cfsr/convert/main.cpp
diff --git a/cfsr/example/main.cpp b/cfsr/example/main.cpp
diff --git a/cfsr/include/cfsr.h b/cfsr/include/cfsr.h
diff --git a/cfsr/include/cfsr_ftp.h b/cfsr/include/cfsr_ftp.h
diff --git a/cfsr/src/cfsr.c b/cfsr/src/cfsr.c
diff --git a/cfsr/src/cfsr_ftp.c b/cfsr/src/cfsr_ftp.c
diff --git a/cfsr/src/convert.c b/cfsr/src/convert.c
diff --git a/data b/data
diff --git a/float2/CMakeLists.txt b/float2/CMakeLists.txt
diff --git a/float2/float2.cpp b/float2/float2.cpp
diff --git a/float2/float2.hpp b/float2/float2.hpp
diff --git a/include/barnes.hpp b/include/barnes.hpp
diff --git a/include/boat.hpp b/include/boat.hpp
diff --git a/include/browser.hpp b/include/browser.hpp
diff --git a/include/cfsr.hpp b/include/cfsr.hpp
diff --git a/include/csv.hpp b/include/csv.hpp
diff --git a/include/date.hpp b/include/date.hpp
diff --git a/include/html.hpp b/include/html.hpp
diff --git a/include/interface.hpp b/include/interface.hpp
diff --git a/include/json.hpp b/include/json.hpp
diff --git a/include/kml.hpp b/include/kml.hpp
diff --git a/include/latlon.hpp b/include/latlon.hpp
diff --git a/include/print.hpp b/include/print.hpp
diff --git a/include/uv.hpp b/include/uv.hpp
diff --git a/include/voyage.hpp b/include/voyage.hpp
diff --git a/include/ws_server_core.hpp b/include/ws_server_core.hpp
diff --git a/include/wsserver.hpp b/include/wsserver.hpp
@@ -43,7 +43,7 @@ class WsServer : public websocketpp::server<websocketpp::config::asio>
 			set_open_handler(websocketpp::lib::bind(&WsServer::on_open, this, _1));
 			set_close_handler(websocketpp::lib::bind(&WsServer::on_close, this, _1));
 
-			listen(80); 			// Listen on port
+			listen(8000); 			// Listen on port
 			start_accept(); 		// Start the server accept loop
 			run();					// Start the ASIO io_service run loop
 		}

diff --git a/include/wssession.hpp b/include/wssession.hpp
diff --git a/res/sailing.ico b/res/sailing.ico
diff --git a/res/sailing.png b/res/sailing.png
diff --git a/res/sailing.rc b/res/sailing.rc
diff --git a/src/barnes1.for b/src/barnes1.for
diff --git a/src/boat.cpp b/src/boat.cpp
diff --git a/src/cfsr.cpp b/src/cfsr.cpp
diff --git a/src/cressman1.for b/src/cressman1.for
diff --git a/src/csv.cpp b/src/csv.cpp
diff --git a/src/interface.cpp b/src/interface.cpp
diff --git a/src/json.cpp b/src/json.cpp
diff --git a/src/kml.cpp b/src/kml.cpp
diff --git a/src/main.cpp b/src/main.cpp
@@ -30,7 +30,7 @@ int main()
 	"\n";
 
 	std::thread wsThread = launchWsServer(wsServer);
-	//launchURL("http://127.0.0.1:8000");
+	launchURL("http://127.0.0.1:8000");
 
 	//voyage = new Voyage(); // origin, destination
 

diff --git a/src/voyage.cpp b/src/voyage.cpp
@@ -144,9 +144,9 @@ bool Voyage::sail() // result: whether we reached our destination
 
 	// Output directory
 	std::stringstream userDir;
-	userDir << "output/" << loginID;
+	userDir << "www/output" ; //<< "/" << loginID;
 	std::stringstream projectDir;
-	projectDir << "output/" << loginID << "/" << runId;
+	projectDir << "www/output" ; //<< "/" << loginID << "/" << runId;
 
 	#ifdef _WIN32
 		CreateDirectory(projectDir.str().c_str(), NULL);

diff --git a/src/wsserver.cpp b/src/wsserver.cpp
diff --git a/www/data b/www/data
diff --git a/www/dest.png b/www/dest.png
diff --git a/www/index.html b/www/index.html
@@ -134,6 +134,15 @@
 				font-family: 微軟正黑體, sans-serif;
 			}
 
+			a.button {
+			    -webkit-appearance: button;
+			    -moz-appearance: button;
+			    appearance: button;
+
+			    text-decoration: none;
+			    color: initial;
+			}
+
 		</style>
 
 	</head>

diff --git a/www/lib/jquery.min.js b/www/lib/jquery.min.js
diff --git a/www/lib/leaflet/images/layers-2x.png b/www/lib/leaflet/images/layers-2x.png
diff --git a/www/lib/leaflet/images/layers.png b/www/lib/leaflet/images/layers.png
diff --git a/www/lib/leaflet/images/marker-icon-2x.png b/www/lib/leaflet/images/marker-icon-2x.png
diff --git a/www/lib/leaflet/images/marker-icon.png b/www/lib/leaflet/images/marker-icon.png
diff --git a/www/lib/leaflet/images/marker-shadow.png b/www/lib/leaflet/images/marker-shadow.png
diff --git a/www/lib/leaflet/leaflet-src.js b/www/lib/leaflet/leaflet-src.js
diff --git a/www/lib/leaflet/leaflet.css b/www/lib/leaflet/leaflet.css
diff --git a/www/lib/leaflet/leaflet.js b/www/lib/leaflet/leaflet.js
diff --git a/www/lib/leaflet/plugins/L.Graticule.js b/www/lib/leaflet/plugins/L.Graticule.js
diff --git a/www/lib/leaflet/plugins/jquery-sidebar.min.js b/www/lib/leaflet/plugins/jquery-sidebar.min.js
diff --git a/www/lib/leaflet/plugins/leaflet-omnivore.min.js b/www/lib/leaflet/plugins/leaflet-omnivore.min.js
diff --git a/www/lib/leaflet/plugins/leaflet-sidebar.min.js b/www/lib/leaflet/plugins/leaflet-sidebar.min.js
diff --git a/www/lib/leaflet/plugins/leaflet.contextmenu.css b/www/lib/leaflet/plugins/leaflet.contextmenu.css
diff --git a/www/lib/leaflet/plugins/leaflet.contextmenu.js b/www/lib/leaflet/plugins/leaflet.contextmenu.js
diff --git a/www/lib/leaflet/plugins/leaflet.toolbar.css b/www/lib/leaflet/plugins/leaflet.toolbar.css
diff --git a/www/lib/leaflet/plugins/leaflet.toolbar.js b/www/lib/leaflet/plugins/leaflet.toolbar.js
diff --git a/www/orig.png b/www/orig.png
diff --git a/www/src/main.js b/www/src/main.js
diff --git a/www/src/map.js b/www/src/map.js
diff --git a/www/src/session.js b/www/src/session.js
diff --git a/www/src/ws.js b/www/src/ws.js
@@ -4,7 +4,7 @@
 var WsClient = function()
 {
 	var ws;
-	var url = "ws://140.122.146.123";
+	var url = "ws://127.0.0.1:8000";
 	var connected = false;
 
 	this.connect = function ()
@@ -100,6 +100,7 @@ function parseVoyage(v)
 	"張帆極限風速: " + v.windlimit + "m/s</br>" +
 	"每日張帆時數: " + v.sailopenhours + "hr</br>" +
 	"檔案名稱: " + v.name +
+	"</br><a href='output/" + v.name + ".csv' download class='button'>下載</a>" +
 	"</div>" +
 	outputlist.innerHTML;
 }