OSDN Git Service

index.htmlの表示変更とその他単位などの変更
authoryonghong1969 <m238079m@mail.kyutech.jp>
Tue, 8 Dec 2015 07:09:45 +0000 (16:09 +0900)
committeryonghong1969 <m238079m@mail.kyutech.jp>
Tue, 8 Dec 2015 07:09:45 +0000 (16:09 +0900)
      "Access-Control-Allow-origin" => "*"

CSS/custom.css
JS/canvas.js
JS/emconrol.js [deleted file]
JS/emcontrol.js
JS/practice.js
app/.vemapi.rb.swp [new file with mode: 0644]
index.html
vem.html [new file with mode: 0755]
wits_fei.html
wits_hitachi.html
wits_jeol.html

index 50d7419..5915939 100755 (executable)
@@ -13,6 +13,7 @@
 \r
 /* PAGE MODULES */\r
 body{\r
+       height: 100%;\r
        font-family: 'Open Sans', sans-serif;\r
        font-weight:300;\r
        color: #005b95;\r
@@ -27,6 +28,9 @@ h2, .h2{
        margin-bottom: 15px;\r
        font-size: 20px;\r
 }\r
+h3.sample1{\r
+       padding: 5px 5px 5px 5px;\r
+}\r
 p {\r
        margin: 0 0 15px;\r
 }\r
@@ -76,10 +80,10 @@ p {
        color:#fff;\r
 }\r
 #map{\r
-       height:400px;   \r
+       height:700px;\r
 }\r
 #footer-map{\r
-       height:250px;   \r
+       height:250px;\r
 }\r
 [class*="animate-"] .overlay {\r
        background: #005995;\r
@@ -125,4 +129,4 @@ p {
 \r
 @media (min-width: 798px) and (max-width: 1021px) {...}\r
 \r
-@media (min-width: 1022px) and (max-width: 1229px) {...}
\ No newline at end of file
+@media (min-width: 1022px) and (max-width: 1229px) {...}\r
index 7bc071e..741849b 100644 (file)
@@ -6,7 +6,7 @@ function tabcheck() {
     var introduce = document.getElementById('introduce');
     var ineh = document.getElementById('eucentricheightcontents');
     var inform = document.getElementById('form');
-    var insingle = document.getElementById('singleparticlecontents');
+    var insingle = document.getElementById('simplephotecontents');
     var intomo = document.getElementById('tomography');
     var inmds = document.getElementById('mds');
 
diff --git a/JS/emconrol.js b/JS/emconrol.js
deleted file mode 100644 (file)
index 9facedf..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-/* 
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-
index 8864065..fdbc1ff 100644 (file)
@@ -4,6 +4,8 @@ console.log("emcontrol");
 function emnamecatch(name){
     console.log("emnamecatch");
     emname=name;
+    var ajax=getAjax();
+    ajax.open("GET","//localhost:9090/"+emname+"/init",true);
     console.log(emname);
 }
 
@@ -57,6 +59,7 @@ var ajax=getAjax();
     if (ajax) {
         try {
             ajax.onreadystatechange = getData;
+            console.log("getData");
         } catch (e) {
             position1.innerHTML = "Onreadystate change error.";
         }
@@ -249,6 +252,7 @@ function stagecontrol(command,absolutex,absolutey,absolutez,absolutea) {
 
        function getData() {
                        if (ajax.readyState==4) {
+        console.log("getData2")
                                        if (ajax.status==200) {
                                                         result.innerHTML = ajax.responseText;
                                                          result2.innerHTML = ajax.responseText;
index c3eafd1..31cf446 100644 (file)
@@ -9,14 +9,14 @@ function cngTab(IDname) {
 
     var inform = document.getElementById('form');
     var informdiv = inform.getElementsByTagName('div');
-    
-    var insingle=document.getElementById('singleparticlecontents');
+
+    var insingle=document.getElementById('simplephotecontents');
     var insinglediv=document.getElementsByTagName('div');
-    
+
     var intomo=document.getElementById('tomography');
-    
+
     var inmds = document.getElementById('mds');
-    
+
 
     if (IDname == 1) {
         introduce.style.display = "";
@@ -53,7 +53,7 @@ function cngTab(IDname) {
         inform.style.display="none";
         intomo.style.display="none";
         inmds.style.display="";
-    }    
+    }
 }
 
 function firsttab() {
@@ -65,12 +65,12 @@ function firsttab() {
 
     var inform = document.getElementById('form');
     var informdiv = inform.getElementsByTagName('div');
-    
-    var insingle=document.getElementById('singleparticlecontents');
+
+    var insingle=document.getElementById('simplephotecontents');
     var insinglediv=document.getElementsByTagName('div');
 
     var intomo=document.getElementById('tomography');
-    
+
     var inmds=document.getElementById('mds');
 
     ineh.style.display = 'none';
@@ -79,5 +79,3 @@ function firsttab() {
     intomo.style.display = 'none';
     inmds.style.display = 'none';
 }
-
-
diff --git a/app/.vemapi.rb.swp b/app/.vemapi.rb.swp
new file mode 100644 (file)
index 0000000..d332d51
Binary files /dev/null and b/app/.vemapi.rb.swp differ
index 94b0243..bdc0efc 100644 (file)
@@ -19,8 +19,8 @@
     </head>
     <body>
         <div class="content-block">
-            <div class="container">
-                <div class="row">
+            <div class="container-fluid">
+                <div class="row-fluid">
                     <div class="col-md-12">
                         <h1>Please Select Electron Microscopes!</h1>
                         <p>Proin eu leo non metus vulputate viverra. Curabitur ac augue ante. Praesent nisl diam, iaculis eget ipsum at, blandit laoreet eros. Nam hendrerit, erat commodo varius consequat, dolor massa tempor massa, vel cursus enim neque pellentesque augue. Aenean ullamcorper et lacus at hendrerit. Phasellus id lectus luctus, congue quam id, tempor justo. Mauris sodales imperdiet nisi eget lacinia. Nulla vehicula eleifend nibh sed malesuada. Praesent eget tortor erat. Nullam a sapien sit amet enim tempor cursus. Sed vehicula nisl sed odio gravida aliquam. Sed metus lorem, vestibulum vel pulvinar vel, condimentum vitae risus. Curabitur in odio ut nisl convallis dapibus sollicitudin vitae orci. Aenean vel molestie massa. Nam vehicula porta arcu, at dapibus nulla pulvinar fermentum. Nam orci enim, elementum ac risus vestibulum, imperdiet placerat mi.</p>
                 </div>
             </div>
         </div>         <div class="service-block">
-            <div class="container">
-                <div class="row">
+            <div class="container-fluid">
+                <div class="row-fluid">
                     <div class="col-md-4 col-sm-4">
                         <div class="animate-paraslide animatedEntrance">
                             <a href="./wits_hitachi.html">
-                                <img src="./image/ef2000.jpg"/>
+                                <img onclick="emnamecatch('hitachi')" src="./image/ef2000.jpg"/>
                                 <div class="overlay">
                                     <h3>HITACHI EF-2000</h3>
                                     <p>Use this electron microscope.</p>
@@ -43,8 +43,9 @@
                     </div>
                     <div class="col-md-4 col-sm-4">
                         <div class="animate-paraslide animatedEntrance">
+                            <img onclick = "emnamecatch('fei')" src="./image/fei.jpg"/>
                             <a href="./wits_fei.html" onclick="emnamecatch('fei')">
-                                <img onclick = "emnamecatch('fei')" src="./image/fei.jpg"/>
+
                                 <div class="overlay">
                                     <h3>FEI TecnaiG^2 Spirit</h3>
                                     <p>Use this electron microscope.</p>
@@ -83,5 +84,6 @@
         <script src="http://maps.google.com/maps/api/js?sensor=false"></script>
         <script src="js/lollies.min.js"></script>
         <script src="js/custom.js"></script>
+
     </body>
 </html>
diff --git a/vem.html b/vem.html
new file mode 100755 (executable)
index 0000000..7bd3e36
--- /dev/null
+++ b/vem.html
@@ -0,0 +1,175 @@
+<!DOCTYPE html>
+<html lang="en">
+       <head>
+               <meta charset="utf-8">
+               <title>VEM Control Interface</title>
+               <link rel="stylesheet" type="text/css" href="CSS/vemclient.css">
+               <script type ="text/javascript" src="JS/ajax.js"></script>
+               <script type ="text/javascript" src="JS/TemControl.js"></script>
+               <script type ="text/javascript" src="JS/filecontrol.js"></script>
+               <script type ="text/javascript" src="JS/filedownload.js"></script>
+               <script type ="text/javascript" src="JS/stagecontrol.js"></script>
+               <script type ="text/javascript" src="JS/mscontrol.js"></script>
+               <script type ="text/javascript" src="JS/Currentcondition.js"></script>
+               <script type ="text/javascript" src="JS/EucentricHeight.js"></script>
+               <script type ="text/javascript" src="JS/changedisplay.js"></script>
+               <script type="text/javascript"></script>
+       </head>
+       <body>
+
+               <b>V</b>irtual <b>E</b>lectron <b>M</b>icroscope Client
+
+               <form id="temselect" name="temselect" action="#" onsubmit="return false;">
+                       <input type="hidden" id="teminfo" name="teminfo" value="none"></input>
+                       <input type="button" name="submit" id="HITACHI" onclick="TemControl('Connect','HITACHI');"></input>
+                       <input type="button" name="submit" id="FEI" onclick="TemControl('Connect','FEI');"></input>
+                       <input type="button" name="submit" id="JEOL" onclick="TemControl('Connect','JEOL');"></input>
+               </form>
+               <br>
+               <div id="connection" style="width:600px; height:20px; border:3px inset; margin:0 auto">
+
+               </div>
+
+
+               <div id="container">
+
+                       <div id="leftside">
+
+       <p>The EM Image</p>
+       <div id="result" style="margin:0 auto; width:400px; height:400px; padding:10px; border:3px solid">The EM-Image from instrument.</div>
+
+       <form id="cameracontrol" name="cameracontrol" action="#" onsubmit="return false;">
+               <input type="hidden" id="fileurl" name="fileurl" value="none"></input>
+
+               <br>
+               <input type="button" style="width:150px;" name="submit" value="Initialization" onclick="TemControl('Control','initialization');"></input>
+               <input type="button" style="width:150px;" name="submit" value="Finalization" onclick="TemControl('Control','finalization');"></input>
+               <br>
+
+               <div id="takephoto">
+                       <div id="left">
+                               <p>Input<input type="text" name="input" class="box" size="30"></input>
+                               <br>
+                               Output<input type="text" name="output" class="box" size="30"></input>
+                               </p>
+                       </div>
+                       <br>
+                       <div id="right">
+                               <input type="button" style="width:150px;" name="submit" value="TakePhoto" onclick="TemControl('TakePhoto',document.cameracontrol.input.value+':'+document.cameracontrol.output.value);">
+                       </div>
+                       <p class ="clearRight" />
+
+               </div>
+
+               <div id="download">
+
+                       <div id="left">
+                               <p>Mode<input type="text" name="mode" class="box" size="30"></input>
+                               <br>
+                               DL<input type="text" name="dlname" class="box" size="30"></input>
+                               </p>
+                       </div>
+                       <br>
+                       <div id="right">
+                               <input type="button" style="width:150px;" name="submit" value="Download" onclick="filewrite();">
+                               <p id="link"></p>
+                       </div>
+                       <p class ="clearRight" />
+               </div>
+        <div id="left">
+                       <div id="stagecontrol">
+
+                               <br>
+                               Absolute coordinate
+                               <p>move x <input type="text" name="x" class="box" size="30" ></input>
+                               <br>
+                               move y <input type="text" name="y" class="box" size="30"></input>
+                               <br>
+                               move z <input type="text" name="z" class="box" size="30"></input>
+                               <br>
+                               tilt a <input type="text" name="a" class="box" size="30"></input>
+                               <br>
+                               </p>
+                       </div>
+                               <br>
+                               <p>Brightnessset(0~200)
+                                               <input type="number" name="brightness"></input></p>
+                               <p>Voltageset (0~120kV)
+                                               <input type="number" name="voltage"></input></p>
+                               <br>
+                               <div id="EucentricHeight">
+                               <p>Eucentric Height<br>
+                                               max:<input type="number" name="max1"></input><span id="max"></span><br>
+                                               speed:<input type="number" name="speed"></input><span id="speed"></span><br>
+                                               zshift:<input type="number" name="place"></input><span id="place"></span><br>
+                                               <input type="submit" name="start" style="width: 100px" value="start" onclick="EucentricHeight('EucentricHeight',max1.value,speed.value,place.value)"></input>
+                                               <input type="submit" name="stop" style="width: 100px" value="stop"></input>
+                               </p>
+                               </div>
+                       </div>
+
+                       <div id="right">
+                       <br>
+                       <br>
+                       <br>
+                       <br>
+                                <input type="button" style="width:150px;" name="submit" value="Detailset" onclick="stagecontrol('detailcatch',x.value,y.value,z.value,a.value)"></input>
+                                       <br>
+                                <input type="button" style="width:150px;" name="submit" value="Autoset" onclick="alert('Under construction! Only use Detailset!')"></input>
+                       <br>
+                       <br>
+                       <br>
+                       <br>
+                                <input type="button" style="widrh:150px;" name="submit" value="Brightnessset" onclick="mscontrol('Brightnessset',brightness.value)"></input>
+                                <br>
+                                       <br>
+                                <input type="button" style="widrh:150px;" name="submit" value="Voltageset" onclick="mscontrol('Voltageset',voltage.value)"></input>
+                       </div>
+        </div>
+               </div>
+       </form>
+                       </div>
+                       <div id="rightside">
+       <p>TEM Control Command</p>
+       <div id="command" style="width:340px; height:570px; padding:10px; border:6px outset">The EM-control commandset.
+       <br>
+       <br>
+       <div id="detail"></div>
+       </div>
+
+        <br>
+
+       <p>Current condition</p>
+       <input type="button" value="push" onClick="Currentcondition('request')"></input>
+       <div id="condition" style="width:340px; height:250; padding:10px; border:6px outset">
+       <div id="Position">Position: </div>
+       <div id="Magnificant">Magnificant: </div>
+       <div id="Brightness">Brightness:</div>
+       <div id="Contrast">Contrast: </div>
+       <div id="Forcus">Focus:  </div>
+       <div id="Voltage">Voltage: </div>
+       </div>
+
+                               <br>
+                               <form name="form1" method="post" action="#">
+                               <p>Set Lenz</p>
+                               <input type="button" value="detailindication" onclick="changedisplay()"></input><br>
+                               <p id="lenzdetail" style="display: none;">
+                                               C1:<input type="number" name="c1">% </input>
+                                               C2:<input type="number" name="c2">%</input>
+                                               <br>
+                                               C3:<input type="number" name="c3">% </input>
+                                               C4:<input type="number" name="c4">%</input>
+                                               <br>
+                                               Obj1:<input type="number" name="obj1">% </input>
+                                               Int1:<input type="number" name="int1">% </input>
+                                               <br>
+
+                               </p>
+                               </form>
+
+                       </div>
+               </div>
+
+       </body>
+</html>
index b78c61a..a97c955 100644 (file)
@@ -55,7 +55,7 @@
                             <div class="navbar-collapse collapse">
                                 <ul class="nav navbar-nav nav-justified">
                                     <li id="mtab1"><a href="#" onclick="cngTab('1');FocusTab('mtab1');tabcheck()">About JEM-2100</a></li>
-                                    <li id="mtab2"><a href="#" onclick="cngTab('2');FocusTab('mtab2');tabcheck()">Single Particle Analysis</a></li>
+                                    <li id="mtab2"><a href="#" onclick="cngTab('2');FocusTab('mtab2');tabcheck()">Simple Photo</a></li>
                                     <!--<li id="mtab3"><a href="#" onclick="FocusTab('mtab3')">Tomography</a></li>-->
                                     <li class="dropdown" id="mtab3">
                                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="FocusTab('mtab3')">Tomography<b class="caret"></b></a>
@@ -76,7 +76,7 @@
                                             <li><a href="#" onclick="bgColChangeWhite()">White</a></li>
                                             <li><a href="#" onclick="bgColChangeGrey()">grey</a></li>
                                     </li>
-                                    <li><a href="select.html">Change EM</a></li>
+                                    <li><a href="index.html">Change EM</a></li>
                                     <li><a href="#">Something else here</a></li>
                                     <li class="divider"></li>
                                     <li class="dropdown-header">Nav header</li>
@@ -139,7 +139,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                             <form name="eucentric" id="eucentricid" action="">
                                 <div class="form-group">
                                     <label>max tilt</label>
-                                    <input type="number" name="maxtilt" id="maxtiltid" onchange="SaveFileContents()" onclick="SaveFileContents()">nm
+                                    <input type="number" name="maxtilt" id="maxtiltid" onchange="SaveFileContents()" onclick="SaveFileContents()">deg
                                 </div>
                                 </p>
                                 <p>
@@ -212,12 +212,12 @@ Highly stable specimen stage enables us to perform a long term observation and a
                 </div>
             </div>
         </div>
-        <div id= 'singleparticlecontents'>
+        <div id= 'simplephotecontents'>
             <div class="content-block">
                 <div class="container">
                     <div class="row">
                         <div class="col-md-12">
-                            <h1>Single particle analysis</h1>
+                            <h1>Simple Photo</h1>
                         </div>
                     </div>
                     <div class="row">
@@ -241,9 +241,12 @@ Highly stable specimen stage enables us to perform a long term observation and a
                             <p>
                                 <label>Step1. Search particle</label>
                             </p>
+
+                            <!--switmood choose to crick Control mode select -->
+
                             Control mode select:&nbsp;&nbsp;<a onclick="switchkey('1');controlmodeselect('key')"><span id="key">Key(ex.↑↓→←,wsad,hjkl)</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a onclick="switchkey('0');controlmodeselect('formmode')"><span id="formmode">Form</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a onclick="switchkey('2');controlmodeselect('gamepad')"><span id="gamepad">Gamepad</span></a>
                             <form name="movestage" id="movestageid" action="">
-                                <div class="form-group">
+                                <p><div class="form-group">
                                     move x
                                     <input type="number" name="movex" id="movex" value="0" onchange="canvasApp()">nm
                                     &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Current x:<span id="currentx"></span>
@@ -298,7 +301,8 @@ Highly stable specimen stage enables us to perform a long term observation and a
                                 Speed:<span id="Speed"></span>
                             </div>
                             </p>
-                            <!--<p>
+<!--
+                            <p>
                                 <label>Save condition</label><br>
                               Todays:<span id="daysdata">a</span>
                             <form name="save" id="saveid">
@@ -307,7 +311,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                                 <a id='DL_link_condition'></a>
                             </form>
                             </p>
-                            -->
+-->
                         </div>
                     </div>
                 </div>
index 1583b91..64ed14c 100644 (file)
@@ -70,7 +70,7 @@
                                             <li><a href="#" onclick="bgColChangeWhite()">White</a></li>
                                             <li><a href="#" onclick="bgColChangeGrey()">grey</a></li>
                                     </li>
-                                    <li><a href="select.html">Change EM</a></li>
+                                    <li><a href="index.html">Change EM</a></li>
                                     <li><a href="#">Something else here</a></li>
                                     <li class="divider"></li>
                                     <li class="dropdown-header">Nav header</li>
index 4b2f0cb..0ac4da2 100644 (file)
@@ -76,7 +76,7 @@
                                             <li><a href="#" onclick="bgColChangeWhite()">White</a></li>
                                             <li><a href="#" onclick="bgColChangeGrey()">grey</a></li>
                                     </li>
-                                    <li><a href="select.html">Change EM</a></li>
+                                    <li><a href="index.html">Change EM</a></li>
                                     <li><a href="#">Something else here</a></li>
                                     <li class="divider"></li>
                                     <li class="dropdown-header">Nav header</li>