]> jspc29.x-matter.uni-frankfurt.de Git - coral.git/commitdiff
jspc29 / coral.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ed6d78e)
progress with the analysis front-end
authorMichael Wiebusch <m.wiebusch@gsi.de>
Thu, 6 Aug 2015 16:32:21 +0000 (18:32 +0200)
committerMichael Wiebusch <m.wiebusch@gsi.de>
Thu, 6 Aug 2015 16:32:21 +0000 (18:32 +0200)
user_interface/selection.css patch | blob | history
user_interface/selector.html patch | blob | history
user_interface/selector.js patch | blob | history

diff --git a/user_interface/selection.css b/user_interface/selection.css
index a60933f2ee994905ef220ee133b49e93b669d3fc..dbd5f38a16a713010a6140daa58bde61179b7835 100644 (file)
--- 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 2463a82d727b9c70ef76b00963f1d29ded0362b2..04a09be75a982c102b51026b9d0af737d2d50591 100644 (file)
--- a/user_interface/selector.html
+++ b/user_interface/selector.html
@@ -18,25 +18,45 @@
   
   </head>
   <body>
-  <h1>A Heading</h1>
-  <p id='pout' >text, text text, text</p>
-  <p>Canvas:</p>
-  
+  <h1>Coral Analysis</h1>
+<!--  <p id='pout' >text, text text, text</p>
+  <p>Canvas:</p> -->
+  <div id='compound_canvas'>
   <canvas id="myCanvas" width="3000" height="300">
   Your browser does not support the HTML5 canvas tag.
   </canvas>
   
   <div onmousedown="return false" id="YDR-Frame" class="frame">
     <div id="selection" class="selectiondiv"></div></div>
-  
+  </div>
   
   <div id='controls'>
     <table width=400>
+      <tr>
+        <td>
+          <input type='button' id='btn_clear_selection' value='clear selection'>
+        </td>
+      </tr>
+      <tr>
+        <td colspan=3>
+          <hr>
+        </td>
+      </tr>
+      <tr>
+        <td colspan=3>
+          contrast
+        </td>
+      </tr>
       <tr>
         <td colspan=3>
           <div id="slider-range"></div>
         </td>
       </tr>
+      <tr>
+        <td colspan=3>
+          <hr>
+        </td>
+      </tr>
       <tr>
         <td>
         </td>
@@ -47,11 +67,6 @@
           density
         </td>
       </tr>
-      <tr>
-        <td>
-          <input type='button' id='btn_clear_selection' value='clear selection'>
-        </td>
-      </tr>
       <tr>
         <td>
           selection average
@@ -68,11 +83,28 @@
           <input type='text' id='text_stdev'>
         </td>
       </tr>
+      <tr>
+        <td>
+          label
+        </td>
+        <td>
+          <input type='text' id='text_label'>
+        </td>
+      </tr>
+      <tr>
+        <td>
+          <input type='button' id='btn_append_data' value='append data'>
+        </td>
+      </tr>
     </table>
   
   </div>
   
+<!--  <div id='notepad'>
+  <TEXTAREA NAME="Address" id="textarea_notepad" ROWS=42 COLS=100 >
+  </TEXTAREA>
   
+  </div>-->
   
   
   </body>
diff --git a/user_interface/selector.js b/user_interface/selector.js
index 2edd569c2376d50fa95662bf167fce10493779a4..7321c26acf7dfdb06826d315c3c654a244640874 100644 (file)
--- 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"
+    );
+    
+  });
+  
 });
 
 
The files for the coral scanner project