<画像表示、サーバの切り替え、JSの整理>

[vem/WITs.git] / disuse / wits_fei.html
diff --git a/wits_fei.html b/disuse/wits_fei.html

similarity index 98%

rename from wits_fei.html

rename to disuse/wits_fei.html

index a97c955..4296213 100644 (file)
--- a/wits_fei.html
+++ b/disuse/wits_fei.html
@@ -9,7 +9,7 @@
          <link rel="shortcut icon" type="image/x-icon" href="favicon.png" />
          <link href="fonts/font-awesome-4.1.0/css/font-awesome.min.css" rel="stylesheet">
          <link href="CSS/bootstrap-3.1.1.min.css" rel="stylesheet">
-        <link href="CSS/lollies.min.css" rel="stylesheet">
+       <link href="CSS/lollies.min.css" rel="stylesheet">
          <link href="CSS/custom.css" rel="stylesheet">
          <script type ="text/javascript" src="JS/practice.js"></script>
          <script type="text/javascript"  src="JS/file.js"></script>
@@ -25,7 +25,7 @@
                  <script src="js/respond-1.4.2.js"></script>
          <![endif]-->
      </head>
-    <body onload="filemethod();filemethod2();filemethod3();firsttab();gamepad();emnamecatch('fei');tilt();emcondition('request')">
+    <body onload="filemethod();filemethod2();filemethod3();firsttab();gamepad();emnamecatch('fei');tilt();">
          <header id="main-header">
              <div class="container">
                  <div class="row">
@@ -55,7 +55,7 @@
                              <div class="navbar-collapse collapse">
                                  <ul class="nav navbar-nav nav-justified">
                                      <li id="mtab1"><a href="#" onclick="cngTab('1');FocusTab('mtab1');tabcheck()">About JEM-2100</a></li>
-                                    <li id="mtab2"><a href="#" onclick="cngTab('2');FocusTab('mtab2');tabcheck()">Simple Photo</a></li>
+                                    <li id="mtab2"><a href="simplePhoto.html">Simple Photo</a></li>
                                      <!--<li id="mtab3"><a href="#" onclick="FocusTab('mtab3')">Tomography</a></li>-->
                                      <li class="dropdown" id="mtab3">
                                          <a href="#" class="dropdown-toggle" data-toggle="dropdown" onclick="FocusTab('mtab3')">Tomography<b class="caret"></b></a>
@@ -246,6 +246,11 @@ Highly stable specimen stage enables us to perform a long term observation and a
  
                              Control mode select:&nbsp;&nbsp;<a onclick="switchkey('1');controlmodeselect('key')"><span id="key">Key(ex.↑↓→←,wsad,hjkl)</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a onclick="switchkey('0');controlmodeselect('formmode')"><span id="formmode">Form</span></a>&nbsp;&nbsp;&nbsp;&nbsp;<a onclick="switchkey('2');controlmodeselect('gamepad')"><span id="gamepad">Gamepad</span></a>
                              <form name="movestage" id="movestageid" action="">
+                              <p><div class="form-group">
+                                  moving distance
+                                  <input type="number" name="movingdistance" id="movingdistance" value="1">nm
+                              </div>
+
                                  <p><div class="form-group">
                                      move x
                                      <input type="number" name="movex" id="movex" value="0" onchange="canvasApp()">nm