From 21aeee22e15fe910da3c4ac28553d13ba1d84952 Mon Sep 17 00:00:00 2001 From: Michael Wiebusch Date: Thu, 6 Aug 2015 18:32:21 +0200 Subject: [PATCH] progress with the analysis front-end --- user_interface/selection.css | 17 ++++++++++-- user_interface/selector.html | 52 +++++++++++++++++++++++++++++------- user_interface/selector.js | 11 ++++++++ 3 files changed, 68 insertions(+), 12 deletions(-) diff --git a/user_interface/selection.css b/user_interface/selection.css index a60933f..dbd5f38 100644 --- a/user_interface/selection.css +++ b/user_interface/selection.css @@ -23,7 +23,7 @@ /* float:right; */ /* position:relative; */ - position:fixed; + position:absolute; top: 100px; left: 100px; width: 3000px; @@ -34,11 +34,24 @@ #controls { + position:absolute; + padding:20px; + top: 500px; + left: 100px; + width: 800px; +/* height: 300px; */ + border:1px solid #d3d3d3; + +} + +#notepad { + position:fixed; + padding:20px; top: 500px; left: 100px; width: 800px; - height: 300px; +/* height: 300px; */ border:1px solid #d3d3d3; } diff --git a/user_interface/selector.html b/user_interface/selector.html index 2463a82..04a09be 100644 --- a/user_interface/selector.html +++ b/user_interface/selector.html @@ -18,25 +18,45 @@ -

A Heading

text, text text, text

Canvas:

- +

Coral Analysis

+ +

- +

+ + + + + + + + + + + + @@ -47,11 +67,6 @@ density - - - + + + + + + +

+ +
+ +
+ contrast +

+ +

- -
selection average @@ -68,11 +83,28 @@
+ label +	+ +
+ +

+ diff --git a/user_interface/selector.js b/user_interface/selector.js index 2edd569..7321c26 100644 --- a/user_interface/selector.js +++ b/user_interface/selector.js @@ -48,6 +48,17 @@ $(document).ready(function(){ calculate(); }); + + $("#btn_append_data").click(function(){ + $("#text_field").val( + $("#text_field").val()+"\n"+ + $("#text_label").val()+"\t"+ + $("#text_avg").val()+"\t"+ + $("#text_stdev").val()+"\t" + ); + + }); + }); -- 2.43.0