Changes to be committed:

author yonghong1969 <m238079m@mail.kyutech.jp>

Thu, 12 Nov 2015 08:10:29 +0000 (17:10 +0900)

committer yonghong1969 <m238079m@mail.kyutech.jp>

Thu, 12 Nov 2015 08:10:29 +0000 (17:10 +0900)
author yonghong1969 <m238079m@mail.kyutech.jp>
Thu, 12 Nov 2015 08:10:29 +0000 (17:10 +0900)
committer yonghong1969 <m238079m@mail.kyutech.jp>
Thu, 12 Nov 2015 08:10:29 +0000 (17:10 +0900)
diff --git a/CSS/vemclient.css~ b/CSS/vemclient.css~

new file mode 100755 (executable)

index 0000000..20d2e20
--- /dev/null
+++ b/CSS/vemclient.css~
@@ -0,0 +1,65 @@
+body{
+  background-color:#F5FFFA;
+  margin-left:auto;
+  margin-right:auto;
+  text-align:center;
+  width:90%;
+}
+
+#HITACHI {
+  border:0px;
+  height:141px;
+  width:300px;
+  background:url(icon/TEM1icon.png) left top no-repeat;
+}
+
+#FEI {
+  border:0px;
+  height:141px;
+  width:300px;
+  background:url(icon/TEM2icon.png) left top no-repeat;
+}
+
+#JEOL {
+  border:0px;
+  height:141px;
+  width:300px;
+  background:url(icon/TEM3icon.png) left top no-repeat;
+}
+
+#container{
+  width:1000px;
+  margin-left:auto;
+  margin-right:auto;
+}
+
+#leftside{
+  width:580px;
+  float:left;
+  margin: 10px;
+}
+
+#rightside{
+  width:380px;
+  float:left;
+  margin: 10px;
+}
+
+div#left{
+  float:left;
+  position:absolute;
+  left:150px;
+  text-align:left;
+}
+div#right{
+  position:relative;
+  left:80px;
+}
+.clearRight{
+  clear:left;
+}
+.box{
+  position:absolute;
+  text-align:left;
+  left:60px;
+}
diff --git a/File/CSS/icon/TEM1icon.png b/File/CSS/icon/TEM1icon.png

deleted file mode 100755 (executable)

index 15c19a0..0000000

Binary files a/File/CSS/icon/TEM1icon.png and /dev/null differ
diff --git a/File/CSS/icon/TEM2icon.png b/File/CSS/icon/TEM2icon.png

deleted file mode 100755 (executable)

index a309b72..0000000

Binary files a/File/CSS/icon/TEM2icon.png and /dev/null differ
diff --git a/File/CSS/icon/TEM3icon.png b/File/CSS/icon/TEM3icon.png

deleted file mode 100755 (executable)

index 7682343..0000000

Binary files a/File/CSS/icon/TEM3icon.png and /dev/null differ
diff --git a/File/log.txt b/File/log.txt

deleted file mode 100755 (executable)

index 1dbd516..0000000
--- a/File/log.txt
+++ /dev/null
@@ -1,278 +0,0 @@
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Accepted!
-Connect HITACHI
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect JEOL
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect JEOL
-Connect HITACHI
-Connect FEI
-Connect JEOL
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect HITACHI
-Connect FEI
-Connect JEOL
-Connect JEOL
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect HITACHI
-Connect FEI
-Connect JEOL
-Connect HITACHI
-Connect FEI
-Connect JEOL
-Connect HITACHI
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect JEOL
-Connect JEOL
-Connect JEOL
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect JEOL
-Accepted!
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect JEOL
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect HITACHI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect HITACHI
-Connect FEI
-Connect FEI
-Connect FEI
diff --git a/JS/Currentcondition.js~ b/JS/Currentcondition.js~

new file mode 100644 (file)

index 0000000..145166a
--- /dev/null
+++ b/JS/Currentcondition.js~
@@ -0,0 +1,66 @@
+function Currentcondition(command) {
+
+ var ajax=getAjax();
+ 
+ if(command == "request"){
+       var position1 = document.getElementById("Position");
+       var magnificant = document.getElementById("Magnificant");
+       var brightness = document.getElementById("Brightness");
+       var contrast = document.getElementById("Contrast");
+       var forcus = document.getElementById("Forcus");
+       var voltage = document.getElementById("Voltage");
+  }else {
+       var position1 = document.anchorsgetElementById("result");
+  }
+  
+  if (ajax) {
+        try{
+          ajax.onreadystatechange = getData;
+        }catch(e){
+      position1.innerHTML="Onreadystate change error.";         
+        }
+        
+        try{
+      ajax.open("GET","//localhost:8000/cgi-bin/vemclient.rb?command="+encodeURIComponent(command),true);
+        }catch(e){
+      position1.innerHTML = "ajax open error";
+        }
+
+    try {
+        ajax.send(null);
+    }catch (e) {
+      position1.innerHTML ="send error";
+    }
+    
+  }else {
+       position1.innerHTML = "you cannot use ajax....";
+  }
+  
+  function getData() { 
+      if (ajax.readyState==4) {
+          if (ajax.status==200) {
+                    console.log("Hello!");
+                    
+                    var resultjson = ajax.responseText;
+                    resultjson=JSON.parse(resultjson);
+                     console.log(typeof resultjson);
+  /*
+                    for (key in resultjson) {
+                    console.log(key+":"+resultjson(key));
+                 }
+                 */
+                    //position1.innerHTML=resultjson;
+                    
+                    position1.innerHTML = "x="+resultjson["Current_stageX"]+" y="+resultjson['Current_stageY']+" z="+resultjson['Current_stageZ']+" a="+resultjson['Current_stageA'];
+               magnificant.innerHTML = "Magnificant:"+resultjson['Magnificant'];
+               brightness.innerHTML = "Brightness:"+resultjson['Brightness'];
+               contrast.innerHTML = "Contrast:"+resultjson['Contrast'];
+               forcus.innerHTML = "Forcus:"+resultjson['Forcus'];
+               voltage.innerHTML = "Voltage:"+resultjson['Voltage'];                
+            //   result.innerHTML = ajax.responseText; 
+             }else {
+               position1.innerHTML = "HTTP transmission....";
+            }
+       }
+  }
+ }
+\ No newline at end of file
diff --git a/JS/TemControl.js~ b/JS/TemControl.js~

new file mode 100755 (executable)

index 0000000..3f61145
--- /dev/null
+++ b/JS/TemControl.js~
@@ -0,0 +1,49 @@
+function TemControl(command,parameter){
+
+  var ajax = getAjax();
+
+  if(command == "Connect"){
+    var result = document.getElementById("connection");
+  }else{
+    var result = document.getElementById("result");
+  }
+
+  if(ajax){
+    try{
+      ajax.onreadystatechange = getData;
+    }catch(e){
+      result.innerHTML = "onreadystate change error";
+    }
+
+    try{
+      ajax.open("GET","//localhost:8000/cgi-bin/vemclient.rb?command="+encodeURIComponent(command)+"&parameter="+encodeURIComponent(parameter),true);
+    }catch(e){
+      result.innerHTML = "ajax open error";
+    }
+
+    try{
+      ajax.send(null);
+    }catch(e){
+      result.innerHTML = "send error";
+    }
+  }else{
+    result.innerHTML = "you cannot use ajax...";
+  }
+
+  function getData(){
+    if(ajax.readyState == 4){
+      if(ajax.status == 200){
+       result.innerHTML = ajax.responseText;
+       if(ajax.responseText.match(/Control/i)){
+         a = ajax.responseText.split(" ");
+         alert(a[1]+a[2]);
+       }
+      }else{
+       result.innerHTML = "HTTP error";
+      }
+    }else{
+      result.innerHTML = "HTTP Transmission...";
+    }
+  }
+
+}
diff --git a/JS/ajax.js~ b/JS/ajax.js~

new file mode 100755 (executable)

index 0000000..0843b4f
--- /dev/null
+++ b/JS/ajax.js~
@@ -0,0 +1,17 @@
+function getAjax(){
+       var ajax = null;
+       try{
+               ajax = new XMLHttpRequest();
+       }catch(e){
+               try{
+                       ajax = new ActiveXObject("Msxml2.XMLHTTP");
+               }catch(e){
+                       try{
+                               ajax = new ActiveXObject("Microsoft.XMLHTTP");
+                       }catch(e){
+                               alert("Not Init");
+                       }
+               }
+       }
+       return ajax;
+}
diff --git a/JS/canvas.js b/JS/canvas.js

index 95bb410..7bc071e 100644 (file)
--- a/JS/canvas.js
+++ b/JS/canvas.js
@@ -9,7 +9,7 @@ function tabcheck() {
      var insingle = document.getElementById('singleparticlecontents');
      var intomo = document.getElementById('tomography');
      var inmds = document.getElementById('mds');
-    
+
      if (insingle.style.display == "") {
          canvasmode = 1;
          canvasApp();
@@ -49,7 +49,7 @@ function eventWindowLoaded() {
   */
  //var movex = document.forms.movestage.movex.value;
  //var movey = document.forms.movestage.movey.value;
-/*       
+/*
   function putTxt(){
   document.onkeydown = funcKey;
   }
@@ -186,7 +186,7 @@ function gamepad() {
       if (gamepad.axes[1] > 0.5) {
       movey = parseInt(movey) + parseInt(10);
       canvasApp();
-     
+
       }
       },1000/60);
       */
@@ -295,8 +295,8 @@ function gamepad() {
              }
          }
      }, 1000 / 60);
-   
-    
+
+
      window.addEventListener("gamepaddisconnected", function(e) {
              console.log("gamepad disconnected");
          });
@@ -305,7 +305,7 @@ function gamepad() {
                  e.gamepad.index, e.gamepad.id,
                  e.gamepad.buttons.length, e.gamepad.axes.length);
      });
-    
+
  };
  
  
@@ -329,11 +329,11 @@ function canvasApp() {
              //if(document.forms.movestage.movey.value!=moveformy){
              moveformy = document.forms.movestage.movey.value;
              movey=parseInt(moveformy);
-            
+
              moveformz = document.forms.moveza.movez.value;
              movez=parseInt(moveformz);
-   
-            
+
+
              stagecontrol('stage',movex,movey,movez,movea);
              emcondition('request');
              //}
@@ -341,7 +341,7 @@ function canvasApp() {
          }
          /*
          var movez = document.forms.s2.movez.value;
-        
+
          if (movez == 0) {
              movez = 1;
          }
@@ -362,7 +362,7 @@ function canvasApp() {
          }
  
          //見る画像
-        img.src = "./CC124crudeダイニン.jpg";
+        img.src = "./image/CC124crudeダイニン.jpg";
  
          //--ふちの設定--現在見えてない
          context.strokeStyle = "#000000";
@@ -393,10 +393,10 @@ function canvastomo() {
              //if(document.forms.movestage.movey.value!=moveformy){
              moveformy = document.forms.movestagetomo.movey.value;
              movey=parseInt(moveformy);
-            
+
              moveformz = document.forms.moveztomo.movez.value;
              movez=parseInt(moveformz);
-            
+
              if (tiltmode == 1) {
                  moveformas = document.forms.setting.standardnum.value;
                  movea = parseInt(moveformas);
@@ -415,7 +415,7 @@ function canvastomo() {
          }
          /*
          var movez = document.forms.s2.movez.value;
-        
+
          if (movez == 0) {
              movez = 1;
          }
@@ -436,7 +436,7 @@ function canvastomo() {
          }
  
          //見る画像
-        img.src = "./axoF11-2 .jpg";
+        img.src = "./image/axoF11-2 .jpg";
  
          //--ふちの設定--現在見えてない
          context.strokeStyle = "#000000";
@@ -457,14 +457,14 @@ function controlmodeselect(modename){
          document.getElementById("gamepad").style.backgroundColor = 'transparent';
          document.getElementById("gamepad2").style.backgroundColor = 'transparent';
          document.getElementById("gamepad3").style.backgroundColor = 'transparent';
-        
+
          if(modename){
              document.getElementById(modename).style.backgroundColor = '#e0ffff';
          }
  }
  
  
-/* 
+/*
   * 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.
@@ -503,11 +503,11 @@ function canvasmds() {
              //if(document.forms.movestage.movey.value!=moveformy){
              moveformy = document.forms.movestagemds.movey.value;
              movey=parseInt(moveformy);
-            
+
              moveformz = document.forms.movezmds.movez.value;
              movez=parseInt(moveformz);
-   
-            
+
+
              stagecontrol('stage',movex,movey,movez,movea);
              emcondition('request');
              //}
@@ -515,7 +515,7 @@ function canvasmds() {
          }
          /*
          var movez = document.forms.s2.movez.value;
-        
+
          if (movez == 0) {
              movez = 1;
          }
@@ -536,7 +536,7 @@ function canvasmds() {
          }
  
          //見る画像
-        img.src = "./flower.jpg";
+        img.src = "./image/flower.jpg";
  
          //--ふちの設定--現在見えてない
          context.strokeStyle = "#000000";
@@ -584,11 +584,11 @@ function canvasroot() {
              //if(document.forms.movestage.movey.value!=moveformy){
              moveformy = document.forms.movestage.movey.value;
              movey=parseInt(moveformy);
-            
+
              moveformz = document.forms.moveza.movez.value;
              movez=parseInt(moveformz);
-   
-            
+
+
              stagecontrol('stage',movex,movey,movez,movea);
              emcondition('request');
              //}
@@ -596,7 +596,7 @@ function canvasroot() {
          }*/
          /*
          var movez = document.forms.s2.movez.value;
-        
+
          if (movez == 0) {
              movez = 1;
          }
@@ -617,7 +617,7 @@ function canvasroot() {
          }
  
          //見る画像
-        img.src = "./ele.jpg";
+        img.src = "./image/ele.jpg";
  
          //--ふちの設定--現在見えてない
          context.strokeStyle = "#000000";
@@ -626,4 +626,4 @@ function canvasroot() {
          //わくの輪郭を書く、引数は左端のx,y,幅,高さ
      }
      drawScreen();
-}
-\ No newline at end of file
+}
diff --git a/JS/emcontrol.js b/JS/emcontrol.js

index 8180a18..8864065 100644 (file)
--- a/JS/emcontrol.js
+++ b/JS/emcontrol.js
@@ -125,7 +125,7 @@ var ajax=getAjax();
                  BeamTiltX3.innerHTML = resultjson['BeamTiltX'];
                  BeamTiltY3.innerHTML = resultjson['BeamTiltY'];
                  Speed3.innerHTML = resultjson['Speed'];
-                
+
                  //   result.innerHTML = ajax.responseText;
              } else {
                  position1.innerHTML = "HTTP transmission....";
@@ -152,13 +152,13 @@ function stagecontrol(command,absolutex,absolutey,absolutez,absolutea) {
         }
  
         if (ajax) {
-                try{
+       /*       try{
                          ajax.onreadystatechange = getData;
                  }catch(e){
                         result.innerHTML="Onreadystate change error.";
                          result2.innerHTML="Onreadystate change error.";
                          result3.innerHTML="Onreadystate change error.";
-                }
+                }*/
  
                  try{
                         ajax.open("GET","//localhost:9090/"+encodeURIComponent(emname)+"/set/stagea?x="+encodeURIComponent(absolutex)+"&y="+encodeURIComponent(absolutey)+"&z="+encodeURIComponent(absolutez)+"&a="+encodeURIComponent(absolutea),true);
@@ -167,7 +167,7 @@ function stagecontrol(command,absolutex,absolutey,absolutez,absolutea) {
                         result.innerHTML = "ajax open error";
                          result2.innerHTML = "ajax open error";
                          result3.innerHTML = "ajax open error";
-                        
+
                  }
  
                 try {
@@ -198,7 +198,7 @@ function stagecontrol(command,absolutex,absolutey,absolutez,absolutea) {
                          }
         }
   }
- 
+
   function objcontrol(command,obj) {
  
   var ajax=getAjax();
@@ -230,7 +230,7 @@ function stagecontrol(command,absolutex,absolutey,absolutez,absolutea) {
                         result.innerHTML = "ajax open error";
                          result2.innerHTML = "ajax open error";
                          result3.innerHTML = "ajax open error";
-                        
+
                  }
  
                 try {
@@ -260,4 +260,4 @@ function stagecontrol(command,absolutex,absolutey,absolutez,absolutea) {
                                                 }
                          }
         }
- }
-\ No newline at end of file
+ }
diff --git a/JS/filecontrol.js~ b/JS/filecontrol.js~

new file mode 100755 (executable)

index 0000000..fa62f37
--- /dev/null
+++ b/JS/filecontrol.js~
@@ -0,0 +1,101 @@
+function fileListDialog(files){
+  var name = new Array();
+  var urn = new Array();
+  var type = new Array();
+  var size = new Array();
+  var latest = new Array();
+
+  
+    i=0
+    name[i] = files[i].name;
+    urn[i] = files[i].urn;
+    type[i] = files[i].type;
+    size[i] = files[i].size;
+    latest[i] = files[i].lastModifiedDate;
+
+  //display file status
+  var output = "<hr>The number of files is "+files.length+"<br><hr/>";
+    output+="Name:"+name[i]+"<br>"+"URN:"+urn[i]+"<br>"+"Type:"+type[i]+"<br>"+"Size:"+size[i]+"<br>"+"Date:"+latest[i]+"<br><hr>"
+  document.getElementById("filestatus").innerHTML = output;
+
+    document.getElementById("filecontent").innerHTML = "";
+  //get file contents
+  fileread(files,"filecontent","file");
+
+}
+
+function fileread(blob,place,variable){
+    var f = blob[i];
+    var reader = new FileReader();
+
+    if(f.type.match("text.*")){
+      reader.onload = function(e){
+       document.getElementById(place).innerHTML = reader.result;
+       document.getElementById(variable).value = reader.result;
+       document.getElementById("flag").value = "text";
+      }
+      reader.readAsText(f,"utf-8");
+    }
+    
+    if(f.type.match("image.*")){
+      reader.onload = function(e){
+       var img = document.createElement("img");
+       img.src = reader.result;
+       document.getElementById(place).appendChild(img);
+        document.getElementById(variable).value = reader.result;
+       document.getElementById("flag").value = "image";
+      }
+      reader.readAsDataURL(f);
+    }
+  
+}
+
+
+function onDrop(event){
+  var files = event.dataTransfer.files;
+  var disp = document.getElementById("disp");
+  disp.innerHTML = "";
+
+  for(i=0;i<files.length;i++){
+    var f = files[i];
+    var reader = new FileReader();
+
+    if(!f.type.match('image.*')&&!f.type.match('text.*')){
+      alert("Drag and Drop Image or Text file!");
+      continue;
+    }
+
+    reader.onerror = function(event){
+      disp.innerHTML = "read error!";
+    }
+    
+    if(f.type.match('text.*')){
+      reader.onload = function(event){
+       disp.innerHTML = event.target.result;
+       document.getElementById("file").value = reader.result;
+      }
+      reader.readAsText(f,"utf-8");
+    }
+
+    if(f.type.match('image.*')){
+      reader.onload = function(event){
+       var img = document.createElement("img");
+       img.src = event.target.result;
+       disp.appendChild(img);
+       document.getElementById("file").value = reader.result;
+      }
+      reader.readAsDataURL(f);
+    }
+  }
+
+  reader.addEventListener('progress',function(event){
+   document.getElementById("progress").innerHTML = Math.floor((event.loaded / event.total)*100);
+  },true);
+
+      event.preventDefault();
+}
+
+function onDragOver(event){
+  event.preventDefault();
+}
+
diff --git a/JS/filedownload.js~ b/JS/filedownload.js~

new file mode 100755 (executable)

index 0000000..e468aee
--- /dev/null
+++ b/JS/filedownload.js~
@@ -0,0 +1,43 @@
+function filewrite(){
+  var ajax = getAjax();
+  var result = document.getElementById("link");
+
+  if(ajax){
+    try{
+      ajax.onreadystatechange = getData;
+    }catch(e){
+      result.innerHTML = "onreadystatechange error!"
+    }
+
+    try{
+      ajax.open("GET","//localhost:8000/images/"+document.cameracontrol.input.value+".tif",true);
+      ajax.responseType = 'blob'
+    }catch(e){
+      result.innerHTML = "ajax open error!";
+    }
+
+    try{
+      ajax.send(null);
+    }catch(e){
+      result.innerHTML = "send error!";
+    }
+  }else{
+    result.innerHTML = "you cannot use ajax...";
+  }
+
+  function getData(){
+    if(ajax.readyState == 4){
+      if(ajax.status == 200){
+       var url = window.URL.createObjectURL(this.response)
+         dl_name = document.cameracontrol.dlname.value+"_"+document.cameracontrol.mode.value;
+       result.innerHTML = '<a href="'+url+'" download='+dl_name+'>download_link</a>';
+      }else{
+       result.innerHTML = "HTTP error!";
+      }
+    }else{
+      result.innerHTML = "HTTP Transmission!";
+    }
+  }
+
+}
+
diff --git a/JS/mscontrol.js~ b/JS/mscontrol.js~

new file mode 100644 (file)

index 0000000..3b51dbd
--- /dev/null
+++ b/JS/mscontrol.js~
@@ -0,0 +1,45 @@
+function mscontrol(command,catchvalue) {
+ 
+ var ajax=getAjax();
+ 
+ if(command == "Brightnessset"){
+       var result = document.getElementById("Brightness");
+       }else if (command == "Voltageset") {
+       var result = document.getElementById("Voltage");
+  }else {
+       var result = document.getElementById("result");
+  }
+  
+  if (ajax) {
+        try{
+          ajax.onreadystatechange = getData;
+        }catch(e){
+      result.innerHTML="Onreadystate change error.";    
+        }
+        
+        try{
+      ajax.open("GET","//localhost:8000/cgi-bin/vemclient.rb?command="+encodeURIComponent(command)+"&catchvalue="+encodeURIComponent(catchvalue),true);         
+        }catch(e){
+      result.innerHTML = "ajax open error";
+        }
+
+    try {
+        ajax.send(null);
+    }catch (e) {
+      result.innerHTML ="send error";
+    }
+    
+  }else {
+       result.innerHTML = "you cannot use ajax....";
+  }
+  
+  function getData() { 
+      if (ajax.readyState==4) {
+          if (ajax.status==200) {
+               result.innerHTML = ajax.responseText; 
+             }else {
+               result.innerHTML = "HTTP transmission....";
+            }
+       }
+  }
+ }
+\ No newline at end of file
diff --git a/JS/stagecontrol.js~ b/JS/stagecontrol.js~

new file mode 100644 (file)

index 0000000..7568b1a
--- /dev/null
+++ b/JS/stagecontrol.js~
@@ -0,0 +1,45 @@
+
+function stagecontrol(command,absolutex,absolutey,absolutez,absolutea) {
+ 
+ var ajax=getAjax();
+ 
+ if(command == "detailcatch"){
+       var result = document.getElementById("detail");
+  }else {
+       var result = document.anchorsgetElementById("result");
+  }
+  
+  if (ajax) {
+        try{
+          ajax.onreadystatechange = getData;
+        }catch(e){
+      result.innerHTML="Onreadystate change error.";    
+        }
+        
+        try{
+      ajax.open("GET","//localhost:8000/cgi-bin/vemclient.rb?command="+encodeURIComponent(command)+"&x="+encodeURIComponent(absolutex)+"&y="+encodeURIComponent(absolutey)+"&z="+encodeURIComponent(absolutez)+"&a="+encodeURIComponent(absolutea),true);
+      //document.getElementById("mid").innerHTML="absolutex="+absolutex+" absolutey="+absolutey;        
+        }catch(e){
+      result.innerHTML = "ajax open error";
+        }
+
+    try {
+        ajax.send(null);
+    }catch (e) {
+      result.innerHTML ="send error";
+    }
+    
+  }else {
+       result.innerHTML = "you cannot use ajax....";
+  }
+  
+  function getData() { 
+      if (ajax.readyState==4) {
+          if (ajax.status==200) {
+               result.innerHTML = ajax.responseText; 
+             }else {
+               result.innerHTML = "HTTP transmission....";
+            }
+       }
+  }
+ }
+\ No newline at end of file
diff --git a/app/vemapi.rb b/app/vemapi.rb

index eb6fb44..f2a893c 100644 (file)
--- a/app/vemapi.rb
+++ b/app/vemapi.rb
@@ -1,14 +1,10 @@
  #!/usr/bin/ruby
-
  require 'sinatra/base'
  require './vem'
  require './hitachicontrol'
  require './feicontrol'
  require './jeolcontrol'
-
-
  class Vemapi < Sinatra::Base
-
      @@controls = {
          "stagea"        => "setStageA",
          "stager"        => "setStager",
@@ -18,18 +14,24 @@ class Vemapi < Sinatra::Base
          "beamtilt"      => "setBeamTilt",
          "speed"         => "setSpeed"
      }
-
-    get '/' do
+   
+ get '/' do
+         headers \
+            "Access-Control-Allow-origin" => "*"
          'VEM API test'
      end
  
      get '/:emname/get' do
+         headers \
+            "Access-Control-Allow-origin" => "*"
          @@vem = VEM.create("#{params[:emname]}");
          result = @@vem.__send__("getCondition")
          "#{result}"
      end
  
      get '/:emname/set/:command' do
+         headers \
+            "Access-Control-Allow-origin" => "*"
          @@vem = VEM.create("#{params[:emname]}");
          command = "#{params[:command]}"
          result = @@vem.__send__(@@controls[command], params)
@@ -38,4 +40,3 @@ class Vemapi < Sinatra::Base
  end
  
   Vemapi.run! :host => 'localhost', :port =>  9090
-
diff --git a/key.jpg b/disuse/key.jpg

similarity index 100%

rename from key.jpg

rename to disuse/key.jpg
diff --git a/lollytin/canvasp.js b/disuse/lollytin/canvasp.js

similarity index 100%

rename from lollytin/canvasp.js

rename to disuse/lollytin/canvasp.js
diff --git a/lollytin/css/bootstrap-3.1.1.min.css b/disuse/lollytin/css/bootstrap-3.1.1.min.css

similarity index 100%

rename from lollytin/css/bootstrap-3.1.1.min.css

rename to disuse/lollytin/css/bootstrap-3.1.1.min.css
diff --git a/lollytin/css/custom.css b/disuse/lollytin/css/custom.css

similarity index 100%

rename from lollytin/css/custom.css

rename to disuse/lollytin/css/custom.css
diff --git a/lollytin/css/lollies.min.css b/disuse/lollytin/css/lollies.min.css

similarity index 100%

rename from lollytin/css/lollies.min.css

rename to disuse/lollytin/css/lollies.min.css
diff --git a/lollytin/file.js b/disuse/lollytin/file.js

similarity index 100%

rename from lollytin/file.js

rename to disuse/lollytin/file.js
diff --git a/lollytin/fonts/font-awesome-4.1.0/css/font-awesome.css b/disuse/lollytin/fonts/font-awesome-4.1.0/css/font-awesome.css

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/css/font-awesome.css

rename to disuse/lollytin/fonts/font-awesome-4.1.0/css/font-awesome.css
diff --git a/lollytin/fonts/font-awesome-4.1.0/css/font-awesome.min.css b/disuse/lollytin/fonts/font-awesome-4.1.0/css/font-awesome.min.css

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/css/font-awesome.min.css

rename to disuse/lollytin/fonts/font-awesome-4.1.0/css/font-awesome.min.css
diff --git a/lollytin/fonts/font-awesome-4.1.0/fonts/FontAwesome.otf b/disuse/lollytin/fonts/font-awesome-4.1.0/fonts/FontAwesome.otf

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/fonts/FontAwesome.otf

rename to disuse/lollytin/fonts/font-awesome-4.1.0/fonts/FontAwesome.otf
diff --git a/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.eot b/disuse/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.eot

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.eot

rename to disuse/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.eot
diff --git a/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.svg b/disuse/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.svg

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.svg

rename to disuse/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.svg
diff --git a/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf b/disuse/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf

rename to disuse/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.ttf
diff --git a/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.woff b/disuse/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.woff

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.woff

rename to disuse/lollytin/fonts/font-awesome-4.1.0/fonts/fontawesome-webfont.woff
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/bordered-pulled.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/bordered-pulled.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/bordered-pulled.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/bordered-pulled.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/core.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/core.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/core.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/core.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/fixed-width.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/fixed-width.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/fixed-width.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/fixed-width.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/font-awesome.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/font-awesome.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/font-awesome.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/font-awesome.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/icons.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/icons.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/icons.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/icons.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/larger.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/larger.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/larger.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/larger.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/list.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/list.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/list.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/list.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/mixins.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/mixins.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/mixins.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/mixins.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/path.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/path.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/path.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/path.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/rotated-flipped.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/rotated-flipped.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/rotated-flipped.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/rotated-flipped.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/spinning.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/spinning.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/spinning.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/spinning.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/stacked.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/stacked.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/stacked.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/stacked.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/less/variables.less b/disuse/lollytin/fonts/font-awesome-4.1.0/less/variables.less

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/less/variables.less

rename to disuse/lollytin/fonts/font-awesome-4.1.0/less/variables.less
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_bordered-pulled.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_bordered-pulled.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_bordered-pulled.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_bordered-pulled.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_core.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_core.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_core.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_core.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_fixed-width.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_fixed-width.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_fixed-width.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_fixed-width.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_icons.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_icons.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_icons.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_icons.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_larger.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_larger.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_larger.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_larger.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_list.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_list.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_list.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_list.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_mixins.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_mixins.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_mixins.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_mixins.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_path.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_path.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_path.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_path.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_rotated-flipped.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_rotated-flipped.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_rotated-flipped.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_rotated-flipped.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_spinning.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_spinning.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_spinning.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_spinning.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_stacked.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_stacked.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_stacked.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_stacked.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/_variables.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/_variables.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/_variables.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/_variables.scss
diff --git a/lollytin/fonts/font-awesome-4.1.0/scss/font-awesome.scss b/disuse/lollytin/fonts/font-awesome-4.1.0/scss/font-awesome.scss

similarity index 100%

rename from lollytin/fonts/font-awesome-4.1.0/scss/font-awesome.scss

rename to disuse/lollytin/fonts/font-awesome-4.1.0/scss/font-awesome.scss
diff --git a/lollytin/grey_background.jpg b/disuse/lollytin/grey_background.jpg

similarity index 100%

rename from lollytin/grey_background.jpg

rename to disuse/lollytin/grey_background.jpg
diff --git a/lollytin/img/Thumbs.db b/disuse/lollytin/img/Thumbs.db

similarity index 100%

rename from lollytin/img/Thumbs.db

rename to disuse/lollytin/img/Thumbs.db
diff --git a/lollytin/img/gallery-img.gif b/disuse/lollytin/img/gallery-img.gif

similarity index 100%

rename from lollytin/img/gallery-img.gif

rename to disuse/lollytin/img/gallery-img.gif
diff --git a/lollytin/img/icons/facebook.png b/disuse/lollytin/img/icons/facebook.png

similarity index 100%

rename from lollytin/img/icons/facebook.png

rename to disuse/lollytin/img/icons/facebook.png
diff --git a/lollytin/img/icons/gplus.png b/disuse/lollytin/img/icons/gplus.png

similarity index 100%

rename from lollytin/img/icons/gplus.png

rename to disuse/lollytin/img/icons/gplus.png
diff --git a/lollytin/img/icons/instagram.png b/disuse/lollytin/img/icons/instagram.png

similarity index 100%

rename from lollytin/img/icons/instagram.png

rename to disuse/lollytin/img/icons/instagram.png
diff --git a/lollytin/img/icons/linkedin.png b/disuse/lollytin/img/icons/linkedin.png

similarity index 100%

rename from lollytin/img/icons/linkedin.png

rename to disuse/lollytin/img/icons/linkedin.png
diff --git a/lollytin/img/icons/phone.png b/disuse/lollytin/img/icons/phone.png

similarity index 100%

rename from lollytin/img/icons/phone.png

rename to disuse/lollytin/img/icons/phone.png
diff --git a/lollytin/img/icons/tumblr.png b/disuse/lollytin/img/icons/tumblr.png

similarity index 100%

rename from lollytin/img/icons/tumblr.png

rename to disuse/lollytin/img/icons/tumblr.png
diff --git a/lollytin/img/icons/twitter.png b/disuse/lollytin/img/icons/twitter.png

similarity index 100%

rename from lollytin/img/icons/twitter.png

rename to disuse/lollytin/img/icons/twitter.png
diff --git a/lollytin/img/icons/youtube.png b/disuse/lollytin/img/icons/youtube.png

similarity index 100%

rename from lollytin/img/icons/youtube.png

rename to disuse/lollytin/img/icons/youtube.png
diff --git a/lollytin/img/mapicon.png b/disuse/lollytin/img/mapicon.png

similarity index 100%

rename from lollytin/img/mapicon.png

rename to disuse/lollytin/img/mapicon.png
diff --git a/lollytin/img/psbg.png b/disuse/lollytin/img/psbg.png

similarity index 100%

rename from lollytin/img/psbg.png

rename to disuse/lollytin/img/psbg.png
diff --git a/lollytin/js/bootstrap-3.1.1.min.js b/disuse/lollytin/js/bootstrap-3.1.1.min.js

similarity index 100%

rename from lollytin/js/bootstrap-3.1.1.min.js

rename to disuse/lollytin/js/bootstrap-3.1.1.min.js
diff --git a/lollytin/js/custom.js b/disuse/lollytin/js/custom.js

similarity index 100%

rename from lollytin/js/custom.js

rename to disuse/lollytin/js/custom.js
diff --git a/lollytin/js/html5shiv-3.7.0.js b/disuse/lollytin/js/html5shiv-3.7.0.js

similarity index 100%

rename from lollytin/js/html5shiv-3.7.0.js

rename to disuse/lollytin/js/html5shiv-3.7.0.js
diff --git a/lollytin/js/jquery-1.7.2.min.js b/disuse/lollytin/js/jquery-1.7.2.min.js

similarity index 100%

rename from lollytin/js/jquery-1.7.2.min.js

rename to disuse/lollytin/js/jquery-1.7.2.min.js
diff --git a/lollytin/js/lollies.min.js b/disuse/lollytin/js/lollies.min.js

similarity index 100%

rename from lollytin/js/lollies.min.js

rename to disuse/lollytin/js/lollies.min.js
diff --git a/lollytin/js/respond-1.4.2.min.js b/disuse/lollytin/js/respond-1.4.2.min.js

similarity index 100%

rename from lollytin/js/respond-1.4.2.min.js

rename to disuse/lollytin/js/respond-1.4.2.min.js
diff --git a/lollytin/nbproject/project.properties b/disuse/lollytin/nbproject/project.properties

similarity index 100%

rename from lollytin/nbproject/project.properties

rename to disuse/lollytin/nbproject/project.properties
diff --git a/lollytin/nbproject/project.xml b/disuse/lollytin/nbproject/project.xml

similarity index 100%

rename from lollytin/nbproject/project.xml

rename to disuse/lollytin/nbproject/project.xml
diff --git a/lollytin/option.js b/disuse/lollytin/option.js

similarity index 100%

rename from lollytin/option.js

rename to disuse/lollytin/option.js
diff --git a/lollytin/plugins/backstretch/backstretch-2.0.4.min.js b/disuse/lollytin/plugins/backstretch/backstretch-2.0.4.min.js

similarity index 100%

rename from lollytin/plugins/backstretch/backstretch-2.0.4.min.js

rename to disuse/lollytin/plugins/backstretch/backstretch-2.0.4.min.js
diff --git a/lollytin/plugins/camera-slider/Camera-master/images/Thumbs.db b/disuse/lollytin/plugins/camera-slider/Camera-master/images/Thumbs.db

similarity index 100%

rename from lollytin/plugins/camera-slider/Camera-master/images/Thumbs.db

rename to disuse/lollytin/plugins/camera-slider/Camera-master/images/Thumbs.db
diff --git a/lollytin/plugins/camera-slider/Camera-master/images/camera-loader.gif b/disuse/lollytin/plugins/camera-slider/Camera-master/images/camera-loader.gif

similarity index 100%

rename from lollytin/plugins/camera-slider/Camera-master/images/camera-loader.gif

rename to disuse/lollytin/plugins/camera-slider/Camera-master/images/camera-loader.gif
diff --git a/lollytin/plugins/camera-slider/Camera-master/images/camera_skins.png b/disuse/lollytin/plugins/camera-slider/Camera-master/images/camera_skins.png

similarity index 100%

rename from lollytin/plugins/camera-slider/Camera-master/images/camera_skins.png

rename to disuse/lollytin/plugins/camera-slider/Camera-master/images/camera_skins.png
diff --git a/lollytin/plugins/camera-slider/camera-slider-1.3.4.min.css b/disuse/lollytin/plugins/camera-slider/camera-slider-1.3.4.min.css

similarity index 100%

rename from lollytin/plugins/camera-slider/camera-slider-1.3.4.min.css

rename to disuse/lollytin/plugins/camera-slider/camera-slider-1.3.4.min.css
diff --git a/lollytin/plugins/camera-slider/camera-slider-1.3.4.min.js b/disuse/lollytin/plugins/camera-slider/camera-slider-1.3.4.min.js

similarity index 100%

rename from lollytin/plugins/camera-slider/camera-slider-1.3.4.min.js

rename to disuse/lollytin/plugins/camera-slider/camera-slider-1.3.4.min.js
diff --git a/lollytin/plugins/camera-slider/easing-1.3.min.js b/disuse/lollytin/plugins/camera-slider/easing-1.3.min.js

similarity index 100%

rename from lollytin/plugins/camera-slider/easing-1.3.min.js

rename to disuse/lollytin/plugins/camera-slider/easing-1.3.min.js
diff --git a/lollytin/plugins/fancybox/Thumbs.db b/disuse/lollytin/plugins/fancybox/Thumbs.db

similarity index 100%

rename from lollytin/plugins/fancybox/Thumbs.db

rename to disuse/lollytin/plugins/fancybox/Thumbs.db
diff --git a/lollytin/plugins/fancybox/blank.gif b/disuse/lollytin/plugins/fancybox/blank.gif

similarity index 100%

rename from lollytin/plugins/fancybox/blank.gif

rename to disuse/lollytin/plugins/fancybox/blank.gif
diff --git a/lollytin/plugins/fancybox/fancy_close.png b/disuse/lollytin/plugins/fancybox/fancy_close.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_close.png

rename to disuse/lollytin/plugins/fancybox/fancy_close.png
diff --git a/lollytin/plugins/fancybox/fancy_loading.png b/disuse/lollytin/plugins/fancybox/fancy_loading.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_loading.png

rename to disuse/lollytin/plugins/fancybox/fancy_loading.png
diff --git a/lollytin/plugins/fancybox/fancy_nav_left.png b/disuse/lollytin/plugins/fancybox/fancy_nav_left.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_nav_left.png

rename to disuse/lollytin/plugins/fancybox/fancy_nav_left.png
diff --git a/lollytin/plugins/fancybox/fancy_nav_right.png b/disuse/lollytin/plugins/fancybox/fancy_nav_right.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_nav_right.png

rename to disuse/lollytin/plugins/fancybox/fancy_nav_right.png
diff --git a/lollytin/plugins/fancybox/fancy_shadow_e.png b/disuse/lollytin/plugins/fancybox/fancy_shadow_e.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_shadow_e.png

rename to disuse/lollytin/plugins/fancybox/fancy_shadow_e.png
diff --git a/lollytin/plugins/fancybox/fancy_shadow_n.png b/disuse/lollytin/plugins/fancybox/fancy_shadow_n.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_shadow_n.png

rename to disuse/lollytin/plugins/fancybox/fancy_shadow_n.png
diff --git a/lollytin/plugins/fancybox/fancy_shadow_ne.png b/disuse/lollytin/plugins/fancybox/fancy_shadow_ne.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_shadow_ne.png

rename to disuse/lollytin/plugins/fancybox/fancy_shadow_ne.png
diff --git a/lollytin/plugins/fancybox/fancy_shadow_nw.png b/disuse/lollytin/plugins/fancybox/fancy_shadow_nw.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_shadow_nw.png

rename to disuse/lollytin/plugins/fancybox/fancy_shadow_nw.png
diff --git a/lollytin/plugins/fancybox/fancy_shadow_s.png b/disuse/lollytin/plugins/fancybox/fancy_shadow_s.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_shadow_s.png

rename to disuse/lollytin/plugins/fancybox/fancy_shadow_s.png
diff --git a/lollytin/plugins/fancybox/fancy_shadow_se.png b/disuse/lollytin/plugins/fancybox/fancy_shadow_se.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_shadow_se.png

rename to disuse/lollytin/plugins/fancybox/fancy_shadow_se.png
diff --git a/lollytin/plugins/fancybox/fancy_shadow_sw.png b/disuse/lollytin/plugins/fancybox/fancy_shadow_sw.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_shadow_sw.png

rename to disuse/lollytin/plugins/fancybox/fancy_shadow_sw.png
diff --git a/lollytin/plugins/fancybox/fancy_shadow_w.png b/disuse/lollytin/plugins/fancybox/fancy_shadow_w.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_shadow_w.png

rename to disuse/lollytin/plugins/fancybox/fancy_shadow_w.png
diff --git a/lollytin/plugins/fancybox/fancy_title_left.png b/disuse/lollytin/plugins/fancybox/fancy_title_left.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_title_left.png

rename to disuse/lollytin/plugins/fancybox/fancy_title_left.png
diff --git a/lollytin/plugins/fancybox/fancy_title_main.png b/disuse/lollytin/plugins/fancybox/fancy_title_main.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_title_main.png

rename to disuse/lollytin/plugins/fancybox/fancy_title_main.png
diff --git a/lollytin/plugins/fancybox/fancy_title_over.png b/disuse/lollytin/plugins/fancybox/fancy_title_over.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_title_over.png

rename to disuse/lollytin/plugins/fancybox/fancy_title_over.png
diff --git a/lollytin/plugins/fancybox/fancy_title_right.png b/disuse/lollytin/plugins/fancybox/fancy_title_right.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancy_title_right.png

rename to disuse/lollytin/plugins/fancybox/fancy_title_right.png
diff --git a/lollytin/plugins/fancybox/fancybox-1.3.4.min.css b/disuse/lollytin/plugins/fancybox/fancybox-1.3.4.min.css

similarity index 100%

rename from lollytin/plugins/fancybox/fancybox-1.3.4.min.css

rename to disuse/lollytin/plugins/fancybox/fancybox-1.3.4.min.css
diff --git a/lollytin/plugins/fancybox/fancybox-1.3.4.pack.js b/disuse/lollytin/plugins/fancybox/fancybox-1.3.4.pack.js

similarity index 100%

rename from lollytin/plugins/fancybox/fancybox-1.3.4.pack.js

rename to disuse/lollytin/plugins/fancybox/fancybox-1.3.4.pack.js
diff --git a/lollytin/plugins/fancybox/fancybox-x.png b/disuse/lollytin/plugins/fancybox/fancybox-x.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancybox-x.png

rename to disuse/lollytin/plugins/fancybox/fancybox-x.png
diff --git a/lollytin/plugins/fancybox/fancybox-y.png b/disuse/lollytin/plugins/fancybox/fancybox-y.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancybox-y.png

rename to disuse/lollytin/plugins/fancybox/fancybox-y.png
diff --git a/lollytin/plugins/fancybox/fancybox.png b/disuse/lollytin/plugins/fancybox/fancybox.png

similarity index 100%

rename from lollytin/plugins/fancybox/fancybox.png

rename to disuse/lollytin/plugins/fancybox/fancybox.png
diff --git a/lollytin/plugins/fancybox/klass-1.0.min.js b/disuse/lollytin/plugins/fancybox/klass-1.0.min.js

similarity index 100%

rename from lollytin/plugins/fancybox/klass-1.0.min.js

rename to disuse/lollytin/plugins/fancybox/klass-1.0.min.js
diff --git a/lollytin/plugins/fancybox/photoswipe-3.0.5.min.css b/disuse/lollytin/plugins/fancybox/photoswipe-3.0.5.min.css

similarity index 100%

rename from lollytin/plugins/fancybox/photoswipe-3.0.5.min.css

rename to disuse/lollytin/plugins/fancybox/photoswipe-3.0.5.min.css
diff --git a/lollytin/plugins/fancybox/photoswipe-3.0.5.min.js b/disuse/lollytin/plugins/fancybox/photoswipe-3.0.5.min.js

similarity index 100%

rename from lollytin/plugins/fancybox/photoswipe-3.0.5.min.js

rename to disuse/lollytin/plugins/fancybox/photoswipe-3.0.5.min.js
diff --git a/lollytin/plugins/hover-animations/b70.png b/disuse/lollytin/plugins/hover-animations/b70.png

similarity index 100%

rename from lollytin/plugins/hover-animations/b70.png

rename to disuse/lollytin/plugins/hover-animations/b70.png
diff --git a/lollytin/plugins/hover-animations/hover-animations-1.0.min.css b/disuse/lollytin/plugins/hover-animations/hover-animations-1.0.min.css

similarity index 100%

rename from lollytin/plugins/hover-animations/hover-animations-1.0.min.css

rename to disuse/lollytin/plugins/hover-animations/hover-animations-1.0.min.css
diff --git a/lollytin/plugins/hover-animations/hover-animations-1.0.min.js b/disuse/lollytin/plugins/hover-animations/hover-animations-1.0.min.js

similarity index 100%

rename from lollytin/plugins/hover-animations/hover-animations-1.0.min.js

rename to disuse/lollytin/plugins/hover-animations/hover-animations-1.0.min.js
diff --git a/lollytin/plugins/hover-animations/transform2d.min.js b/disuse/lollytin/plugins/hover-animations/transform2d.min.js

similarity index 100%

rename from lollytin/plugins/hover-animations/transform2d.min.js

rename to disuse/lollytin/plugins/hover-animations/transform2d.min.js
diff --git a/lollytin/plugins/justinaguilar-animations/animations.css b/disuse/lollytin/plugins/justinaguilar-animations/animations.css

similarity index 100%

rename from lollytin/plugins/justinaguilar-animations/animations.css

rename to disuse/lollytin/plugins/justinaguilar-animations/animations.css
diff --git a/lollytin/plugins/match-height/match-height-0.5.1.min.js b/disuse/lollytin/plugins/match-height/match-height-0.5.1.min.js

similarity index 100%

rename from lollytin/plugins/match-height/match-height-0.5.1.min.js

rename to disuse/lollytin/plugins/match-height/match-height-0.5.1.min.js
diff --git a/lollytin/plugins/respond-1.4.2.min.js b/disuse/lollytin/plugins/respond-1.4.2.min.js

similarity index 100%

rename from lollytin/plugins/respond-1.4.2.min.js

rename to disuse/lollytin/plugins/respond-1.4.2.min.js
diff --git a/lollytin/plugins/validation/Thumbs.db b/disuse/lollytin/plugins/validation/Thumbs.db

similarity index 100%

rename from lollytin/plugins/validation/Thumbs.db

rename to disuse/lollytin/plugins/validation/Thumbs.db
diff --git a/lollytin/plugins/validation/captchaoverlay.png b/disuse/lollytin/plugins/validation/captchaoverlay.png

similarity index 100%

rename from lollytin/plugins/validation/captchaoverlay.png

rename to disuse/lollytin/plugins/validation/captchaoverlay.png
diff --git a/lollytin/plugins/validation/validation-2.2.min.css b/disuse/lollytin/plugins/validation/validation-2.2.min.css

similarity index 100%

rename from lollytin/plugins/validation/validation-2.2.min.css

rename to disuse/lollytin/plugins/validation/validation-2.2.min.css
diff --git a/lollytin/plugins/validation/validation-2.2.min.js b/disuse/lollytin/plugins/validation/validation-2.2.min.js

similarity index 100%

rename from lollytin/plugins/validation/validation-2.2.min.js

rename to disuse/lollytin/plugins/validation/validation-2.2.min.js
diff --git a/lollytin/practice.js b/disuse/lollytin/practice.js

similarity index 100%

rename from lollytin/practice.js

rename to disuse/lollytin/practice.js
diff --git a/lollytin/sample.html b/disuse/lollytin/sample.html

similarity index 100%

rename from lollytin/sample.html

rename to disuse/lollytin/sample.html
diff --git a/lollytin/tags.html b/disuse/lollytin/tags.html

similarity index 100%

rename from lollytin/tags.html

rename to disuse/lollytin/tags.html
diff --git a/lollytin/ver2.html b/disuse/lollytin/ver2.html

similarity index 100%

rename from lollytin/ver2.html

rename to disuse/lollytin/ver2.html
diff --git a/lollytin/ver3-2.html b/disuse/lollytin/ver3-2.html

similarity index 100%

rename from lollytin/ver3-2.html

rename to disuse/lollytin/ver3-2.html
diff --git a/lollytin/ver3.html b/disuse/lollytin/ver3.html

similarity index 100%

rename from lollytin/ver3.html

rename to disuse/lollytin/ver3.html
diff --git a/lollytin/white_background.png b/disuse/lollytin/white_background.png

similarity index 100%

rename from lollytin/white_background.png

rename to disuse/lollytin/white_background.png
diff --git a/nbproject/project.properties b/disuse/nbproject/project.properties

similarity index 100%

rename from nbproject/project.properties

rename to disuse/nbproject/project.properties
diff --git a/nbproject/project.xml b/disuse/nbproject/project.xml

similarity index 100%

rename from nbproject/project.xml

rename to disuse/nbproject/project.xml
diff --git a/test.html b/disuse/test.html

similarity index 100%

rename from test.html

rename to disuse/test.html
diff --git a/test2.html b/disuse/test2.html

similarity index 100%

rename from test2.html

rename to disuse/test2.html
diff --git a/ver3-2.html b/disuse/ver3-2.html

similarity index 100%

rename from ver3-2.html

rename to disuse/ver3-2.html
diff --git a/wg.gif b/disuse/wg.gif

similarity index 100%

rename from wg.gif

rename to disuse/wg.gif
diff --git a/whitegray.html b/disuse/whitegray.html

similarity index 100%

rename from whitegray.html

rename to disuse/whitegray.html
diff --git a/whitegray.jpg b/disuse/whitegray.jpg

similarity index 100%

rename from whitegray.jpg

rename to disuse/whitegray.jpg
diff --git a/whitegray_files/analytics.js b/disuse/whitegray_files/analytics.js

similarity index 100%

rename from whitegray_files/analytics.js

rename to disuse/whitegray_files/analytics.js
diff --git a/whitegray_files/ca-pub-1371203131723711.js b/disuse/whitegray_files/ca-pub-1371203131723711.js

similarity index 100%

rename from whitegray_files/ca-pub-1371203131723711.js

rename to disuse/whitegray_files/ca-pub-1371203131723711.js
diff --git a/whitegray_files/colorsample.css b/disuse/whitegray_files/colorsample.css

similarity index 100%

rename from whitegray_files/colorsample.css

rename to disuse/whitegray_files/colorsample.css
diff --git a/whitegray_files/show_ads.js b/disuse/whitegray_files/show_ads.js

similarity index 100%

rename from whitegray_files/show_ads.js

rename to disuse/whitegray_files/show_ads.js
diff --git a/whitegray_files/sp.gif b/disuse/whitegray_files/sp.gif

similarity index 100%

rename from whitegray_files/sp.gif

rename to disuse/whitegray_files/sp.gif
diff --git a/whitegray_files/widgets.js b/disuse/whitegray_files/widgets.js

similarity index 100%

rename from whitegray_files/widgets.js

rename to disuse/whitegray_files/widgets.js
diff --git a/ダウンロード.tiff b/disuse/ダウンロード.tiff

similarity index 100%

rename from ダウンロード.tiff

rename to disuse/ダウンロード.tiff
diff --git a/CC124crudeダイニン.jpg b/image/CC124crudeダイニン.jpg

similarity index 100%

rename from CC124crudeダイニン.jpg

rename to image/CC124crudeダイニン.jpg
diff --git a/axoF11-2 .jpg b/image/axoF11-2 .jpg

similarity index 100%

rename from axoF11-2 .jpg

rename to image/axoF11-2 .jpg
diff --git a/fla.jpg b/image/disuse/fla.jpg

similarity index 100%

rename from fla.jpg

rename to image/disuse/fla.jpg
diff --git a/purin.jpeg b/image/disuse/purin.jpeg

similarity index 100%

rename from purin.jpeg

rename to image/disuse/purin.jpeg
diff --git a/yuri.jpg b/image/disuse/yuri.jpg

similarity index 100%

rename from yuri.jpg

rename to image/disuse/yuri.jpg
diff --git a/ef2000.jpg b/image/ef2000.jpg

similarity index 100%

rename from ef2000.jpg

rename to image/ef2000.jpg
diff --git a/ele.jpg b/image/ele.jpg

similarity index 100%

rename from ele.jpg

rename to image/ele.jpg
diff --git a/fei.jpg b/image/fei.jpg

similarity index 100%

rename from fei.jpg

rename to image/fei.jpg
diff --git a/fei.png b/image/fei.png

similarity index 100%

rename from fei.png

rename to image/fei.png
diff --git a/flower.jpg b/image/flower.jpg

similarity index 100%

rename from flower.jpg

rename to image/flower.jpg
diff --git a/hi.png b/image/hi.png

similarity index 100%

rename from hi.png

rename to image/hi.png
diff --git a/hi2.png b/image/hi2.png

similarity index 100%

rename from hi2.png

rename to image/hi2.png
diff --git a/jeol.jpg b/image/jeol.jpg

similarity index 100%

rename from jeol.jpg

rename to image/jeol.jpg
diff --git a/jeol.png b/image/jeol.png

similarity index 100%

rename from jeol.png

rename to image/jeol.png
diff --git a/select.html b/index.html

similarity index 97%

rename from select.html

rename to index.html

index e6874d3..94b0243 100644 (file)
--- a/select.html
+++ b/index.html
@@ -33,7 +33,7 @@
                      <div class="col-md-4 col-sm-4">
                          <div class="animate-paraslide animatedEntrance">
                              <a href="./wits_hitachi.html">
-                                <img src="./ef2000.jpg"/>
+                                <img src="./image/ef2000.jpg"/>
                                  <div class="overlay">
                                      <h3>HITACHI EF-2000</h3>
                                      <p>Use this electron microscope.</p>
@@ -44,7 +44,7 @@
                      <div class="col-md-4 col-sm-4">
                          <div class="animate-paraslide animatedEntrance">
                              <a href="./wits_fei.html" onclick="emnamecatch('fei')">
-                                <img onclick = "emnamecatch('fei')" src="./fei.jpg"/>
+                                <img onclick = "emnamecatch('fei')" src="./image/fei.jpg"/>
                                  <div class="overlay">
                                      <h3>FEI TecnaiG^2 Spirit</h3>
                                      <p>Use this electron microscope.</p>
@@ -55,7 +55,7 @@
                      <div class="col-md-4 col-sm-4">
                          <div class="animate-paraslide animatedEntrance">
                              <a href="./wits_jeol.html">
-                                <img onclick = "emnamecatch('jeol')" src="./jeol.jpg" alt="empicture"/>
+                                <img onclick = "emnamecatch('jeol')" src="./image/jeol.jpg" alt="empicture"/>
                                  <div class="overlay">
                                      <h3>JEOL JEM-2100</h3>
                                      <p>Use this electron microscope.</p>
@@ -66,7 +66,7 @@
                  </div>
              </div>
          </div>
-        
+
          <!-- SCRIPTS -->
          <script src="js/jquery-1.7.2.min.js"></script>
          <script src="js/bootstrap-3.1.1.min.js"></script>
diff --git a/File/CSS/vemclient.css b/tsurutafile/File/CSS/vemclient.css

old mode 100755 (executable)

new mode 100644 (file)

similarity index 100%

rename from File/CSS/vemclient.css

rename to tsurutafile/File/CSS/vemclient.css
diff --git a/cgi-bin/activetem.rb b/tsurutafile/cgi-bin/activetem.rb

similarity index 100%

rename from cgi-bin/activetem.rb

rename to tsurutafile/cgi-bin/activetem.rb
diff --git a/tsurutafile/cgi-bin/activetem.rb~ b/tsurutafile/cgi-bin/activetem.rb~

new file mode 100755 (executable)

index 0000000..24305d4
--- /dev/null
+++ b/tsurutafile/cgi-bin/activetem.rb~
@@ -0,0 +1,2 @@
+$activehost = '192.168.4.218'
+$activeport = '22222'
diff --git a/cgi-bin/implementation.rb b/tsurutafile/cgi-bin/implementation.rb

similarity index 100%

rename from cgi-bin/implementation.rb

rename to tsurutafile/cgi-bin/implementation.rb
diff --git a/tsurutafile/cgi-bin/implementation.rb~ b/tsurutafile/cgi-bin/implementation.rb~

new file mode 100755 (executable)

index 0000000..bbd74c7
--- /dev/null
+++ b/tsurutafile/cgi-bin/implementation.rb~
@@ -0,0 +1,19 @@
+#!/ruby/bin/ruby
+
+$tem = Hash.new{|h,k| h[k]=Hash.new(&h.default_proc)}
+
+$tem = {
+       'HITACHI' => {
+               'host' => '192.168.4.218',
+               'port' => '11111'
+       },
+       'FEI' => {
+               'host' => '192.168.4.218',
+               'port' => '22222'
+       },
+       'JEOL' => {
+               'host' => '192.168.4.218',
+               'port' => '33333'
+       }
+}
+
diff --git a/cgi-bin/settem.rb b/tsurutafile/cgi-bin/settem.rb

similarity index 100%

rename from cgi-bin/settem.rb

rename to tsurutafile/cgi-bin/settem.rb
diff --git a/tsurutafile/cgi-bin/settem.rb~ b/tsurutafile/cgi-bin/settem.rb~

new file mode 100755 (executable)

index 0000000..377b9c0
--- /dev/null
+++ b/tsurutafile/cgi-bin/settem.rb~
@@ -0,0 +1,41 @@
+#!/usr/local/bin/ruby
+
+require "socket"
+require "./cgi-bin/implementation"
+require "./cgi-bin/activetem"
+
+class SetTem
+
+  def initialize(activetem)
+    @@tem = activetem
+    #get TEM_Instrument info
+    @@host = $tem["#{activetem}"]["host"]
+    @@port = $tem["#{activetem}"]["port"]
+
+    #set TEM_instrument info
+    tem = File.open("./cgi-bin/activetem.rb","w")
+    tem.write "$activehost = '#{@@host}'\n$activeport = '#{@@port}'\n"
+    
+    tem.close
+
+  end
+
+  def connect
+    
+    log = File.open("./File/log.txt","a")
+    socket = TCPSocket.open($activehost,$activeport)
+    socket.puts "Connect:#{@@tem}"
+    socket.flush
+
+    output = socket.gets
+    log.write output
+
+    log.close
+    socket.close
+
+    return output
+
+  end
+  
+end
+
diff --git a/cgi-bin/vemclient.rb b/tsurutafile/cgi-bin/vemclient.rb

similarity index 100%

rename from cgi-bin/vemclient.rb

rename to tsurutafile/cgi-bin/vemclient.rb
diff --git a/tsurutafile/cgi-bin/vemclient.rb~ b/tsurutafile/cgi-bin/vemclient.rb~

new file mode 100755 (executable)

index 0000000..fbc3533
--- /dev/null
+++ b/tsurutafile/cgi-bin/vemclient.rb~
@@ -0,0 +1,132 @@
+#!/usr/local/bin/ruby
+
+require "cgi"
+require "socket"
+require "./cgi-bin/settem"
+require "./cgi-bin/activetem"
+require "rubygems"
+require "systemu"
+require "json"
+
+cgi = CGI.new
+
+command = cgi['command']
+command = CGI.unescapeHTML(command)
+
+parameter = cgi['parameter']
+parameter = CGI.unescapeHTML(parameter)
+
+
+case command
+
+when "Connect" then
+  temset = SetTem.new(parameter)
+  result = temset.connect
+
+when "StageSet", "MagnificationSet", "ImageShift" then
+  socket = TCPSocket.open($activehost,$activeport)
+  socket.puts parameter
+
+  
+  result = socket.gets.chomp
+  if result == "Accepted!" then
+    tiff2gif = "source Eos/env/Eos_env;tiff2mrc -i images/download.tif -o images/download.mrc;mrc2gif -i images/download.mrc -o images/download.gif"
+    systemu tiff2gif
+  end
+  result = "<img src = 'images/download.gif' height=200 width=400><br>"
+
+
+#when something then
+  #do_something
+  #
+  #
+when "Control" then
+  socket = TCPSocket.open($activehost,$activeport)
+ 
+  control={"Command"=>"Connect","Parameter"=>parameter}
+  controlj=control.to_json
+  socket.puts controlj
+  puts controlj
+  result = socket.gets
+  
+  
+when "detailcatch" then
+
+  socket = TCPSocket.open($activehost,$activeport)
+     
+  movex=cgi['x']
+  movex=CGI.unescapeHTML(movex)
+  movey=cgi['y'] 
+  movey=CGI.unescapeHTML(movey)
+  movez=cgi['z'] 
+  movez=CGI.unescapeHTML(movez)
+  tilta=cgi['a'] 
+  tilta=CGI.unescapeHTML(tilta)
+
+  position={"Command"=>"Control","Parameter"=>"StagesetA","GonionXA"=>movex.to_i,"GonionYA"=>movey.to_i,"GonionZA"=>movez.to_i,"GonionAA"=>tilta.to_i}
+
+=begin .to_json not use!
+  socket.puts "{'Command':'Control','Parameter':'StargesetA','GonionX':"+movex.to_s+",'GonionY':"+movey.to_s+",'GonionZ':"+movez.to_s+",'GonionA':"+tilta.to_s+"}"
+  puts "{'Command':'Control','Parameter':'StargesetA','GonionX':"+movex.to_s+",'GonionY':"+movey.to_s+",'GonionZ':"+movez.to_s+",'GonionA':"+tilta.to_s+"}"
+=end
+
+  positionj=position.to_json
+  socket.puts   positionj
+  puts positionj
+
+  result = "move x ="+movex.to_s+" move y ="+movey.to_s+" move z ="+movez.to_s+" tilt a ="+tilta.to_s+"<br>"
+
+when "request" then
+ socket = TCPSocket.open($activehost,$activeport)
+ request = {"Command"=>"Request"}
+ requestj = request.to_json
+ puts requestj
+ socket.puts requestj
+ result = socket.gets 
+ puts result
+  
+
+when "TakePhoto" then
+  filename = parameter.split(":")
+  tiff2gif = "source Eos/env/Eos_env;tiff2mrc -i images/#{filename[0]}.tif -o images/#{filename[0]}.mrc;mrc2gif -i images/#{filename[0]}.mrc -o images/#{filename[1]}.gif"
+  systemu tiff2gif
+
+  result = "<img src = 'images/#{filename[1]}.gif' height=400 width=400><br>"
+
+when "Brightnessset" then
+   
+   socket = TCPSocket.open($activehost,$activeport)
+   Bv=cgi['catchvalue']
+   Bv=CGI.unescapeHTML(Bv)
+   
+   brightinfo={"Command"=>"Control","Parameter"=>"Brightnessset","Brightvalue"=>Bv.to_i}
+   
+   brightinfoj=brightinfo.to_json
+   socket.puts brightinfoj
+   puts brightinfoj  
+   result = "Brightness: "+Bv.to_s
+
+when "Voltageset" then
+
+   socket = TCPSocket.open($activehost,$activeport)
+   Voltagevalue=cgi['catchvalue']
+   Voltagevalue=CGI.unescapeHTML(Voltagevalue)
+   
+   voltageinfo={"Command"=>"Control","Parameter"=>"Voltageset","Voltagevalue"=>Voltagevalue.to_i}
+   
+   voltageinfoj=voltageinfo.to_json
+   socket.puts voltageinfoj
+   puts voltageinfoj
+   
+   result = "Volatege : "+Voltagevalue.to_s+"<br>"
+
+else
+  #do_something_other
+end
+
+
+#return ajax-engine::create HTML code
+puts "Content-type: text/html\n\n"
+puts ""
+
+puts result
diff --git a/emcontrol.js b/tsurutafile/emcontrol.js

similarity index 100%

rename from emcontrol.js

rename to tsurutafile/emcontrol.js
diff --git a/images/download.gif b/tsurutafile/images/download.gif

similarity index 100%

rename from images/download.gif

rename to tsurutafile/images/download.gif
diff --git a/images/download.mrc b/tsurutafile/images/download.mrc

similarity index 100%

rename from images/download.mrc

rename to tsurutafile/images/download.mrc
diff --git a/images/download.tif b/tsurutafile/images/download.tif

similarity index 100%

rename from images/download.tif

rename to tsurutafile/images/download.tif
diff --git a/images/leaf.gif b/tsurutafile/images/leaf.gif

similarity index 100%

rename from images/leaf.gif

rename to tsurutafile/images/leaf.gif
diff --git a/images/leaf.mrc b/tsurutafile/images/leaf.mrc

similarity index 100%

rename from images/leaf.mrc

rename to tsurutafile/images/leaf.mrc
diff --git a/images/leaf.tif b/tsurutafile/images/leaf.tif

similarity index 100%

rename from images/leaf.tif

rename to tsurutafile/images/leaf.tif
diff --git a/images/test.gif b/tsurutafile/images/test.gif

similarity index 100%

rename from images/test.gif

rename to tsurutafile/images/test.gif
diff --git a/images/test.mrc b/tsurutafile/images/test.mrc

similarity index 100%

rename from images/test.mrc

rename to tsurutafile/images/test.mrc
diff --git a/images/test.tif b/tsurutafile/images/test.tif

similarity index 100%

rename from images/test.tif

rename to tsurutafile/images/test.tif
diff --git a/vem.html b/tsurutafile/vem.html

similarity index 100%

rename from vem.html

rename to tsurutafile/vem.html
diff --git a/tsurutafile/vem.html~ b/tsurutafile/vem.html~

new file mode 100755 (executable)

index 0000000..4556a01
--- /dev/null
+++ b/tsurutafile/vem.html~
@@ -0,0 +1,151 @@
+<!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"></script>
+  </head>
+  <body onLoad="Currentcondition('request')">
+
+    <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="stagecontrol">
+      <div id="left">
+        <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>
+        <br>
+        <p>Brightnessset(0～200)
+        <input type="text" name="brightness"></p> 
+        <p>Voltageset (0～120kV)
+        <input type="text" name="voltage"></p> 
+        </p>   
+      </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">Forcus:  </div>
+       <div id="Voltage">Voltage: </div>
+       </div>  
+       
+       
+      </div>
+    </div>
+
+  </body>
+</html>
diff --git a/vemserver.rb b/tsurutafile/vemserver.rb

similarity index 100%

rename from vemserver.rb

rename to tsurutafile/vemserver.rb
diff --git a/tsurutafile/vemserver.rb~ b/tsurutafile/vemserver.rb~

new file mode 100755 (executable)

index 0000000..6a110ea
--- /dev/null
+++ b/tsurutafile/vemserver.rb~
@@ -0,0 +1,35 @@
+#!/usr/bin/ruby
+
+require "socket"
+require "thread"
+
+class FEIControlServer
+  @@flag = true
+
+  def initialize()
+    @server = TCPServer.open("192.168.4.218",11111)
+    puts @server.to_s
+  end
+
+  def listener
+    while @@flag
+      Thread.start(@server.accept){|socket|
+       begin
+         line = socket.gets.chomp
+         puts line
+         socket.puts "Accepted!"
+         
+
+       ensure
+         socket.close
+       
+       end
+      }
+    end
+  end
+
+end
+
+fei = FEIControlServer.new
+fei.listener
+
diff --git a/wits_fei.html b/wits_fei.html

index 463b88c..b78c61a 100644 (file)
--- a/wits_fei.html
+++ b/wits_fei.html
@@ -18,7 +18,7 @@
          <script type="text/javascript" src="JS/canvas.js"></script>
          <script type="text/javascript" src="JS/emcontrol.js"></script>
          <script type="text/javascript" src="JS/ajax.js"></script>
-        
+
   <!--       <script type="text/javascript" src="JS/gamepad.js"></script> -->
          <!--[if lt IE 9]>
                  <script src="js/html5shiv-3.7.0.js"></script>
@@ -32,7 +32,7 @@
                      <div class="col-md-3 spacer"></div>
                      <div class="col-md-6">
                          <!-- LOGO 4️--><b>W</b>ebsystem <b>I</b>ntegrated <b>T</b>ems
-                        <div id="logo"><a href="/"><img src="fei.png" /></a></div>
+                        <div id="logo"><a href="/"><img src="image/fei.png" /></a></div>
                      </div>
                      <div class="col-md-3 spacer"></div>
                  </div>
@@ -66,7 +66,7 @@
                                      </li>
                                      <li id="mtab4"><a href="#" onclick="cngTab('5');tabcheck();FocusTab('mtab4')">MDS</a></li>
                                      <li id="mtab5"><a href="#" onclick="FocusTab('mtab5')">Information</a></li>
-                                    <!--       <li id="mtab6"><a href="#" onclick="FocusTab('mtab6')"></a></li> 
+                                    <!--       <li id="mtab6"><a href="#" onclick="FocusTab('mtab6')"></a></li>
                                              <li id="mtab7"><a href="#" onclick="FocusTab('mtab7')" >Nav Item7</a></li>-->
                                      <li class="dropdown" id="mtab8">
                                          <a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="FocusTab('mtab8')">Option<b class="caret"></b></a>
@@ -155,7 +155,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                                      &nbsp;&nbsp;
                                      <input type="number" name="zshift" id="zshift" onchange="SaveFileContents()" onclick="SaveFileContents()">nm
                                  </div>
-                                </p>  
+                                </p>
                              </form>
                              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                              <button type="submit" class="btn btn-default" id="submit" onclick="SaveFileContents()">Start</button>
@@ -300,7 +300,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              </p>
                              <!--<p>
                                  <label>Save condition</label><br>
-                              Todays:<span id="daysdata">a</span> 
+                              Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
@@ -396,7 +396,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                                          <option value="4">four sheets</option>
                                          <option value="8">eight sheets</option>
                                      </select>
-                                </div>    
+                                </div>
                              </form>
                              <p>
                                  <label>Step3. Take Photo</label>
@@ -423,7 +423,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              <!--
                              <p>
                                  <label>Save condition</label><br>
-                                Todays:<span id="daysdata">a</span> 
+                                Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
@@ -524,7 +524,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              </p>
                              <!--<p>
                                  <label>Save condition</label><br>
-                              Todays:<span id="daysdata">a</span> 
+                              Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
diff --git a/wits_hitachi.html b/wits_hitachi.html

index 9daa4c2..1583b91 100644 (file)
--- a/wits_hitachi.html
+++ b/wits_hitachi.html
@@ -18,7 +18,7 @@
          <script type="text/javascript" src="JS/canvas.js"></script>
          <script type="text/javascript" src="JS/emcontrol.js"></script>
          <script type="text/javascript" src="JS/ajax.js"></script>
-        
+
   <!--       <script type="text/javascript" src="JS/gamepad.js"></script> -->
          <!--[if lt IE 9]>
                  <script src="js/html5shiv-3.7.0.js"></script>
@@ -32,7 +32,7 @@
                      <div class="col-md-3 spacer"></div>
                      <div class="col-md-6">
                          <!-- LOGO 4️--><b>W</b>ebsystem <b>I</b>ntegrated <b>T</b>ems
-                        <div id="logo"><a href="/"><img src="hi2.png" /></a></div>
+                        <div id="logo"><a href="/"><img src="image/hi2.png" /></a></div>
                      </div>
                      <div class="col-md-3 spacer"></div>
                  </div>
@@ -60,7 +60,7 @@
                                      <li id="mtab3"><a href="#" id="mtab31"><span style="color:#7f7f7f">Tomography</span></a></li>
                                      <li id="mtab4"><a href="#" onclick="cngTab('5');tabcheck();FocusTab('mtab4')">MDS</a></li>
                                      <li id="mtab5"><a href="#" onclick="FocusTab('mtab5')">Information</a></li>
-                                    <!--       <li id="mtab6"><a href="#" onclick="FocusTab('mtab6')"></a></li> 
+                                    <!--       <li id="mtab6"><a href="#" onclick="FocusTab('mtab6')"></a></li>
                                              <li id="mtab7"><a href="#" onclick="FocusTab('mtab7')" >Nav Item7</a></li>-->
                                      <li class="dropdown" id="mtab8">
                                          <a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="FocusTab('mtab8')">Option<b class="caret"></b></a>
@@ -149,7 +149,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                                      &nbsp;&nbsp;
                                      <input type="number" name="zshift" id="zshift" onchange="SaveFileContents()" onclick="SaveFileContents()">nm
                                  </div>
-                                </p>  
+                                </p>
                              </form>
                              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                              <button type="submit" class="btn btn-default" id="submit" onclick="SaveFileContents()">Start</button>
@@ -294,7 +294,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              </p>
                              <!--<p>
                                  <label>Save condition</label><br>
-                              Todays:<span id="daysdata">a</span> 
+                              Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
@@ -390,7 +390,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                                          <option value="4">four sheets</option>
                                          <option value="8">eight sheets</option>
                                      </select>
-                                </div>    
+                                </div>
                              </form>
                              <p>
                                  <label>Step3. Take Photo</label>
@@ -417,7 +417,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              <!--
                              <p>
                                  <label>Save condition</label><br>
-                                Todays:<span id="daysdata">a</span> 
+                                Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
@@ -518,7 +518,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              </p>
                              <!--<p>
                                  <label>Save condition</label><br>
-                              Todays:<span id="daysdata">a</span> 
+                              Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
@@ -549,4 +549,3 @@ Highly stable specimen stage enables us to perform a long term observation and a
          <script src="JS/custom.js"></script>
      </body>
  </html>
-
diff --git a/wits_jeol.html b/wits_jeol.html

index cc6de0f..4b2f0cb 100644 (file)
--- a/wits_jeol.html
+++ b/wits_jeol.html
@@ -18,7 +18,7 @@
          <script type="text/javascript" src="JS/canvas.js"></script>
          <script type="text/javascript" src="JS/emcontrol.js"></script>
          <script type="text/javascript" src="JS/ajax.js"></script>
-        
+
   <!--       <script type="text/javascript" src="JS/gamepad.js"></script> -->
          <!--[if lt IE 9]>
                  <script src="js/html5shiv-3.7.0.js"></script>
@@ -32,7 +32,7 @@
                      <div class="col-md-3 spacer"></div>
                      <div class="col-md-6">
                          <!-- LOGO 4️--><b>W</b>ebsystem <b>I</b>ntegrated <b>T</b>ems
-                        <div id="logo"><a href="/"><img src="jeol.png" /></a></div>
+                        <div id="logo"><a href="/"><img src="image/jeol.png" /></a></div>
                      </div>
                      <div class="col-md-3 spacer"></div>
                  </div>
@@ -66,7 +66,7 @@
                                      </li>
                                      <li id="mtab4"><a href="#" onclick="cngTab('5');tabcheck();FocusTab('mtab4')">MDS</a></li>
                                      <li id="mtab5"><a href="#" onclick="FocusTab('mtab5')">Information</a></li>
-                                    <!--       <li id="mtab6"><a href="#" onclick="FocusTab('mtab6')"></a></li> 
+                                    <!--       <li id="mtab6"><a href="#" onclick="FocusTab('mtab6')"></a></li>
                                              <li id="mtab7"><a href="#" onclick="FocusTab('mtab7')" >Nav Item7</a></li>-->
                                      <li class="dropdown" id="mtab8">
                                          <a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="FocusTab('mtab8')">Option<b class="caret"></b></a>
@@ -155,7 +155,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                                      &nbsp;&nbsp;
                                      <input type="number" name="zshift" id="zshift" onchange="SaveFileContents()" onclick="SaveFileContents()">nm
                                  </div>
-                                </p>  
+                                </p>
                              </form>
                              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                              <button type="submit" class="btn btn-default" id="submit" onclick="SaveFileContents()">Start</button>
@@ -300,7 +300,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              </p>
                              <!--<p>
                                  <label>Save condition</label><br>
-                              Todays:<span id="daysdata">a</span> 
+                              Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
@@ -396,7 +396,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                                          <option value="4">four sheets</option>
                                          <option value="8">eight sheets</option>
                                      </select>
-                                </div>    
+                                </div>
                              </form>
                              <p>
                                  <label>Step3. Take Photo</label>
@@ -423,7 +423,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              <!--
                              <p>
                                  <label>Save condition</label><br>
-                                Todays:<span id="daysdata">a</span> 
+                                Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
@@ -524,7 +524,7 @@ Highly stable specimen stage enables us to perform a long term observation and a
                              </p>
                              <!--<p>
                                  <label>Save condition</label><br>
-                              Todays:<span id="daysdata">a</span> 
+                              Todays:<span id="daysdata">a</span>
                              <form name="save" id="saveid">
                                  File name：<input id="name" placeholder="mytext">.txt
                                  &nbsp;&nbsp;&nbsp;<button onclick="ConditionFileSave()" class="btn btn-default">Save</button>
author	yonghong1969 <m238079m@mail.kyutech.jp>
	Thu, 12 Nov 2015 08:10:29 +0000 (17:10 +0900)
committer	yonghong1969 <m238079m@mail.kyutech.jp>
	Thu, 12 Nov 2015 08:10:29 +0000 (17:10 +0900)