rm vem

diff --git a/test/server/vem/feicontrol.rb b/test/server/vem/feicontrol.rb
index e579089..15ae776 100755 (executable)
--- a/test/server/vem/feicontrol.rb
+++ b/test/server/vem/feicontrol.rb
@@ -1,5 +1,4 @@
 require "json"
-require 'chunky_png'
 require "./vem/vem"
 
 
@@ -84,9 +83,25 @@ class FEIControl < VEM
   end
 
   def acquisition
-    stream = ChunkyPNG::Datastream.from_file('./vem/sample.png')
-    array =  ChunkyPNG::Chunk::ImageData.combine_chunks(stream.data_chunks).unpack('C*')
-    "#{array}"
+   # 画像ファイルをひらく
+    File.open("img", "r") do |file|
+      $img_array = JSON.load(file)
+    end
+
+    # 画像配列の長さ取得
+    img_length = $img_array.length
+
+    # リサイズ用の配列生成
+    array128 = Array.new(128).map{ Array.new(128) }
+
+    # 元画像をリサイズ
+    for x in 0..127 do
+      for y in 0..127 do
+        array128[y][x] = $img_array[y*16][x*16]
+      end
+    end
+
+    "#{array128}"
   end 
 
   def getCondition

diff --git a/test/view/img.js b/test/view/img.js
index af3cf78..5486029 100644 (file)
--- a/test/view/img.js
+++ b/test/view/img.js
@@ -14,7 +14,7 @@ function draw(data){
   imgData = ctx.createImageData(128, 128);
   emData = JSON.parse(data);
 
-  // 各ピクセルの色情報設定
+// 各ピクセルの色情報設定
   for (var i=0;i<128;i++){
     for (var j=0;j<128;j++){
       var n = j*4+i*128*4;

diff --git a/test/view/mock/img.js b/test/view/mock/img.js
index ec29170..80a02d8 100644 (file)
--- a/test/view/mock/img.js
+++ b/test/view/mock/img.js
@@ -3,8 +3,7 @@ var i = 0;
 
 
 function startAcq(){
-  console.log("start");
-  $("button").text("stop");
+ $("button").text("stop");
   ws = new WebSocket("ws://localhost:3000");
 
   // メッセージ受信時の処理
@@ -14,8 +13,7 @@ function startAcq(){
     }else{
       ws.send("acq");
       draw(JSON.parse(event.data));
-      console.log(event.data);
-      console.log(i);
+     console.log(i);
       i = i + 1;
     }
   };
@@ -23,8 +21,8 @@ function startAcq(){
 }
 
 function stopAcq(){
+ $("button").text("start");
   console.log("stop");
-  $("button").text("start");
   ws.close(1000, "close");
 }
 
@@ -60,3 +58,4 @@ function draw(data){
   // CanvasのコンテキストにImageDataを設定
   ctx.putImageData(imgData, 0, 0);
 }
+

diff --git a/vem b/vem
deleted file mode 160000 (submodule)
index 674f342..0000000
--- a/vem
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 674f34239b4db10bbd764ba3b70ad4308e65c295

diff --git a/vemapi/Gemfile b/vemapi/Gemfile
new file mode 100644 (file)
index 0000000..bbf6d18
--- /dev/null
+++ b/vemapi/Gemfile
@@ -0,0 +1 @@
+gem 'sinatra', '~> 1.4.4'

diff --git a/vemapi/Gemfile.lock b/vemapi/Gemfile.lock
new file mode 100644 (file)
index 0000000..b61b9dc
--- /dev/null
+++ b/vemapi/Gemfile.lock
@@ -0,0 +1,16 @@
+GEM
+  specs:
+    rack (1.5.2)
+    rack-protection (1.5.3)
+      rack
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    tilt (1.4.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  sinatra (~> 1.4.4)

diff --git a/vemapi/app/vemapi.rb b/vemapi/app/vemapi.rb
index 9c5d0f1..2c50f2a 100644 (file)
--- a/vemapi/app/vemapi.rb
+++ b/vemapi/app/vemapi.rb
@@ -9,53 +9,53 @@ require '../../vem/test'
 
 class Vemapi < Sinatra::Base
 
-  set :environment, :production
+set :environment, :production
 
-  @@controls = {
-    "stagea"        => "setStageA",
-    "stager"        => "setStager",
-    "spotsize"      => "setSpotSize",
-    "magnification" => "setMagnification",
-    "obj"           => "setObj",
-    "beamtilt"      => "setBeamTilt",
-    "speed"         => "setSpeed"
-  }
+@@controls = {
+        "stagea"        => "setStageA",
+        "stager"        => "setStager",
+        "spotsize"      => "setSpotSize",
+        "magnification" => "setMagnification",
+        "obj"           => "setObj",
+        "beamtilt"      => "setBeamTilt",
+        "speed"         => "setSpeed"
+    }
 
-  get '/' do
-    headers \
-      "Access-Control-Allow-origin" => "*"
-    'VEM API test'
-  end
+    get '/' do
+        headers \
+            "Access-Control-Allow-origin" => "*"
+        'VEM API test'
+    end
 
-  get '/:emname/get' do
-    headers \
-      "Access-Control-Allow-origin" => "*"
+    get '/:emname/get' do
+        headers \
+            "Access-Control-Allow-origin" => "*"
+ 
+       # @@vem = VEM.create("#{params[:emname]}");
+       # result = @@vem.__send__("getCondition")
+       # "#{result}"
+    end
 
-    # @@vem = VEM.create("#{params[:emname]}");
-    # result = @@vem.__send__("getCondition")
-    # "#{result}"
-  end
+    get '/:emname/set/setstager' do
+         headers \
+            "Access-Control-Allow-origin" => "*"
+        @@vem = VEM.create("#{params[:emname]}");
+       result = @@vem.setStageR(1,0,0,0)
+       "#{result}"
+    end
 
-  get '/:emname/set/setstager' do
-    headers \
-      "Access-Control-Allow-origin" => "*"
-    @@vem = VEM.create("#{params[:emname]}");
-    result = @@vem.setStageR(1,0,0,0)
-    "#{result}"
-  end
+     get '/:emname/set/acq' do
+         headers \
+            "Access-Control-Allow-origin" => "*"
+        @@vem = VEM.create("#{params[:emname]}");
+       result = @@vem.acquisition
+       "#{result}"
+    end
 
-  get '/:emname/set/acq' do
-    headers \
-      "Access-Control-Allow-origin" => "*"
-    @@vem = VEM.create("#{params[:emname]}");
-    result = @@vem.acquisition
-    "#{result}"
-  end
-
-  get '/test' do
-    test = TEST.new    
-    test.test_acquisition
-  end
+    get '/test' do
+       test = TEST.new 
+       test.test_acquisition
+    end
 
 
 end