Merge branch 'master' of github.com:vocalab/vsq

vocalab · Feb 22, 2012 · aa97042 · aa97042
2 parents 230565b + 9345306
commit aa97042
Show file tree

Hide file tree

Showing 6 changed files with 108 additions and 38 deletions.
diff --git a/index.html b/index.html
@@ -1,22 +1,34 @@
 <!DOCTYPE html>
 <html lang="ja">
-  <head>
-    <meta charset="utf-8">
-    <title></title>
-    <link type="text/css" rel="stylesheet" href="/stylesheets/index.css" />
-    <meta name="keywords" content="">
-    <meta name="description" content="">
-    <!--[if lt IE8]>
-    <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
-    <![endif]-->
-  </head>
-  <body><center>
-    <img src="images/chrysant.jpg">
-    <p>{{ image }}</p>
-    <p>{{ greeting }}</p>
-    <form action="/parse" enctype="multipart/form-data" method="post">
-      <input type="file" name="file" />
-      <input type="submit" value="解析">
-    </form>
-    </div></body>
-</html>
+	<head>
+		<meta charset="utf-8">
+		<title>Vocalab_Converter</title>
+ 		<link type="text/css" rel="stylesheet" href="/stylesheets/index.css" />
+ 		<meta name="keywords" content="vocaloid vocalab 筑波大学　実験" />
+ 		<meta name="description" content="" />
+ 		<!--[if lt IE8]>
+  		<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
+ 		<![endif]-->
+	</head>
+	<body>
+		<div id="wrapper">
+			<div id="header">
+				<h1>vocalab vsq file converter</h1>	
+			</div>
+			<div id="content">
+				<div id="content_image">
+					<img src="images/chrysant.jpg" />
+				</div>
+				<div id="content_form">
+					<form action="/parse" enctype="multipart/form-data" method="post">
+						<input type="file" name="file" />
+						<input type="submit" value="解析">
+					</form>
+				</div>
+				<div id="content_explain">
+					<p>{{ greeting }}</p>
+				</div>
+			</div>
+		</div>
+	</body>
+</html>
diff --git a/javascripts/jquery.parse.js b/javascripts/jquery.parse.js
@@ -10,6 +10,9 @@ $(document).ready(function(){
             text: "dynamics curve"
         },
         yAxis: {
+        	title: {
+        		text: 'dynamics'
+        	},
             max: 128,
             min: 0
         },
@@ -47,6 +50,7 @@ $(document).ready(function(){
             }
         },
         series:[{
+        	name: 'dynamics',
             data: []
         }]
     });
@@ -61,6 +65,9 @@ $(document).ready(function(){
             text: "pitch curve"
         },
         yAxis: {
+        	title: {
+        		text: 'pitch'
+        	},
             max: 30000,
             min: -30000
         },
@@ -94,6 +101,7 @@ $(document).ready(function(){
                 }
             },
             series: {
+            	name: 'pitch',
                 step: true
             }
         },

diff --git a/main.py b/main.py
@@ -12,8 +12,8 @@
 class MainPage(webapp.RequestHandler):
     def get(self):
         template_values = {
-                'greeting': 'VSQファイルを解析し、加工するプログラムです',
-                'image':'上記画像はテストで表示しています。'
+                'greeting': 'VSQファイルを解析し、加工するプログラムです<br>画像はwin内のデータを使っているので、完成次第差し替えてください。',
+
                 }
 
         path = os.path.join(os.path.dirname(__file__), 'index.html')

diff --git a/normaltrack.py b/normaltrack.py
@@ -123,9 +123,9 @@ def get_event(self):
             'Length': str(self.length),
             'Note#': str(self.note)
             }
-        for key, value in self.options.items():
-            self.options[key] = str(value)
-        event.update(self.options)
+        for key, value in self.prop.items():
+            self.prop[key] = str(value)
+        event.update(self.prop)
         if self.vibrato:
             vd = int((1 - int(self.vibrato['Length']) / 100.0) *
                     self.length / 5) * 5

diff --git a/stylesheets/index.css b/stylesheets/index.css
@@ -1,17 +1,42 @@
-body {
-  font-family: Verdana, Helvetica, sans-serif;
-  margin: 0;
-  padding: 0;
-  font-size: 100%;
-  background: #ccc;
+@charset "utf-8";
+@import "reset.css";
+html{
+	height:100%;
+}
+body{
+	height: 600px;
+	font-family: Verdana, Helvetica, sans-serif;
+	background: url("../images/chrysant.jpg");
+	background-repeat:no-repeat;
+	background-position:100% 100%; 
+	background-attachment: fixed; 
+	background-color:white;
 }
 #wrapper{
-  width: 800px;
-  margin: 0 auto;
-  background: #fff;
+	height:100%;
 }
 div#header {
-  background: #ccc;
-  width: 100%;
-  height: 100px;
-}
+	background: black;
+	margin:0 0 20px 0;
+}
+
+#content {
+	font-size:small;
+	text-align:center;
+	width:100%;
+	height:100%;
+}
+#content_image{
+	margin-left: auto;
+	margin-right: auto;
+	margin:0 0 20px 0;
+}
+#content_form{
+}
+#content_explanation{
+}
+h1{
+	margin:auto;
+	font-size:20px;
+	color:white;
+}
diff --git a/stylesheets/reset.css b/stylesheets/reset.css
@@ -0,0 +1,25 @@
+html, body, div, span, applet, object, iframe, h1, h2, h3,
+h4, h5, h6, p, blockquote, pre, a, abbr, acronym,
+address, big, cite, code, del, dfn, em, font, img, ins,
+kbd, q, s, samp, small, strike, strong, sub, sup, tt,
+var, dl, dt, dd, ol, ul, li, fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td{
+margin:0;
+padding:0;
+border:0;
+outline:0;
+font-weight:inherit;
+font-style:inherit;
+font-size:100%;
+font-family:inherit;
+vertical-align:baseline;
+}
+:focus{outline:0;}
+a, a:link, a:visited, a:hover, a:active{text-decoration:none}
+table{border-collapse:separate; border-spacing:0;}
+th, td {text-align:left; font-weight:normal;}
+img, iframe {border:none; text-decoration:none;}
+ol, ul{list-style:none;}
+input, textarea, select, button {font-size:100%; font-family:inherit;}
+select{margin:inherit;}
+hr{margin:0; padding:0; border:0; color:#000; background-color:#000; height:1px}