Mercurial > hg > human-echolocation-java-webapp

changeset 39:b31c64b316c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
the orientation now uses a dropdown; some css work.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Thu, 12 Dec 2013 17:08:58 +0000
parents 91ecbdda6f4a
children 65338d2507bc 2a104856cdd8
files WebContent/StyleSheet.css WebContent/index.jsp
diffstat 2 files changed, 31 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/WebContent/StyleSheet.css	Thu Dec 12 16:39:26 2013 +0000
+++ b/WebContent/StyleSheet.css	Thu Dec 12 17:08:58 2013 +0000
@@ -21,3 +21,13 @@
     font-style: italic;
 }
 
+.debug {
+    border: 0.5px dashed;
+    font-size: 9pt;
+    font-family: monospace;
+    padding: 10 18;
+}
+
+.player {
+    border: 0.25px solid;
+}
--- a/WebContent/index.jsp	Thu Dec 12 16:39:26 2013 +0000
+++ b/WebContent/index.jsp	Thu Dec 12 17:08:58 2013 +0000
@@ -54,10 +54,15 @@
                 Azimuth (-17 to +17):
                 <input type="text" name="azim" size="8" value="${azim}" >
                 <br />
-                Orientation (angled / horiz):
-                <input type="text" name="orient" size="8" value="${orient}">
-                <br />
-                Dirweight (angled / horiz):
+
+                Orientation:<br>
+                <div align="left"><br>
+                    <input type="radio" name="orient" value="horz" checked> Horizontal<br>
+                    <input type="radio" name="orient" value="angled"> Angled<br />
+                </div>
+
+
+                Dirweight ():
                 <input type="text" name="dirweight" size="8" value="${dirweight}">
                 <br />
                 <p class="description">Controls how easy it is to distinguish whether the reflector is to the left or the right (the lower .dirweight is, the easier).</p>
@@ -69,17 +74,9 @@
             </div>
         </form>
 
-
-        <div id="player">
+        <div class="player">
             <c:choose>
                 <c:when test="${distSet==true}">
-                    <p class="debug">
-                        Generating echo with the following parameters:
-                        <br/>Distance <c:out value="${dist}"/>
-                        <br/>Azim <c:out value="${azim}"/>
-                        <br/>Dirweight <c:out value="${dirweight}"/>
-                        <br/>Orient <c:out value="${orient}"/>
-                    </p>
                     <embed src="/echoapp/HumanEcho?dist=<c:out value="${dist}"/>&amp;azim=<c:out value="${azim}"/>&amp;dirweight=<c:out value="${dirweight}"/>&amp;orient=<c:out value="${orient}"/>" type="audio/x-wav"/>
                 </c:when>
                 <c:otherwise>
@@ -88,6 +85,17 @@
             </c:choose>
         </div>
         <br />
+
+        <div class="debug">
+            <h3>Debug info</h3>
+            <p>
+            Distance: <c:out value="${dist}"/>;
+            Azim: <c:out value="${azim}"/>;
+            Dirweight: <c:out value="${dirweight}"/>;
+            Orient: <c:out value="${orient}"/>
+            </p>
+        </div>
+
     </body>
 </html>