rm test/timeMeas/Rakefile, acqTest.rb

diff --git a/doc/vemapi.txt b/doc/vemapi.txt
index 7656531..c8aa391 100644 (file)
--- a/doc/vemapi.txt
+++ b/doc/vemapi.txt
@@ -32,23 +32,43 @@ http://localhost:9090/fei/set/stager?x=1&&y=0&&z=2&&a=0
 {"x”:"1","y”:"0","z”:"2","a”:"0"}
 
 
-# スポットサイズ指定
-# /:emname/set/spotsize
+# スポットサイズ指定（絶対値）
+# /:emname/set/spotsizea
 parameters sps
 
 例：
-http://localhost:9090/fei/set/spotsize?sps=3
+http://localhost:9090/fei/set/spotsizea?sps=3
 
 返り値：
 {"spotSizeIndex":"3"}
 
+# スポットサイズ指定（相対値）
+# /:emname/set/spotsizer
+parameters sps
+
+例：
+http://localhost:9090/fei/set/spotsizer?sps=3
+
+返り値：
+{"spotSizeIndex":"3"}
+
+
+# 倍率設定（絶対値）
+# /:emname/set/magnificationa
+parameters mag
+
+例：
+http://localhost:9090/fei/set/magnificationa?mag=1
+
+返り値：
+{"magIndex":"1"}
 
-# 倍率設定
-# /:emname/set/magnification
+# 倍率設定（相対値）
+# /:emname/set/magnificationr
 parameters mag
 
 例：
-http://localhost:9090/fei/set/magnification?mag=1
+http://localhost:9090/fei/set/magnificationr?mag=1
 
 返り値：
 {"magIndex":"1"}

diff --git a/test/timeMeas/Rakefile b/test/timeMeas/Rakefile
deleted file mode 100644 (file)
index 9334465..0000000
--- a/test/timeMeas/Rakefile
+++ /dev/null
@@ -1,13 +0,0 @@
-require "./acqTest"
-
-task :test1, [:em] do |t, args|
-  puts args.em
-  acq_test = AcqTest.new(args.em)
-  acq_test.test1
-end
-
-task :test2, [:em] do |t, args|
-  puts args.em
-  acq_test = AcqTest.new(args.em)
-  acq_test.test2
-end

diff --git a/test/timeMeas/acqTest.rb b/test/timeMeas/acqTest.rb
deleted file mode 100644 (file)
index 762c259..0000000
--- a/test/timeMeas/acqTest.rb
+++ /dev/null
@@ -1,73 +0,0 @@
-### load ########################
-
-require "json"
-require "benchmark"
-require "em-websocket"
-require "../../vem/vem"
-require "../../vem/mock"
-require "../../tool/imageProc"
-
-# FEIのPCのみ使用可能
-begin
-  require "../../vem/feicontrol"
-rescue LoadError
-end
-
-#################################
-
-class AcqTest
-  include ImageProc
-
-  def initialize(inst)
-    @vem = VEM.create(inst)
-    @image_array = nil
-    @params = {
-      "size"=>0,
-      "binning"=>1,
-      "exptime"=>1
-    }
-  end   
-
-  # 撮影設定・撮影・256階調変換
-  def test1
-    Benchmark.bm 10 do |r| 
-      r.report "acq_init" do 
-        @vem.acquisition_init( 4, 0.07, 0 )
-      end
-      r.report "acq" do
-        @image_array = @vem.acquisition
-      end
-      r.report "convert" do
-        converted_image = convert_256(@image_array)
-      end
-    end
-  end
-
-  # WebSocket通信・撮影・256階調変換
-  def test2
-    EM::WebSocket.start(host: "localhost", port:3000) do |ws|
-
-      # 接続確立時の処理
-      ws.onopen do
-        puts "WebSocket connection open"
-        ws.send('{"type":"connect", "msg":"true"}')
-      end
-
-      ws.onmessage do |message|
-        data =  JSON.parse(message)
-        if(data["type"]=="settings")
-          puts "rec: #{data}"
-          params = data["msg"]
-          @vem.acquisition_init( params["binning"].to_i, params["exptime"].to_i, params["size"].to_i)
-        elsif(data["type"]=="acq")
-          @image_array = @vem.acquisition
-          converted_image = convert_256(@image_array)
-          send_buf =  JSON.generate(converted_image)
-          ws.send(send_buf)
-        end
-      end
-    end
-  end
-
-end
-

diff --git a/test/timeMeas/grobal.js b/test/timeMeas/grobal.js
index 822a935..1633fcd 100644 (file)
--- a/test/timeMeas/grobal.js
+++ b/test/timeMeas/grobal.js
@@ -1,2 +1,2 @@
-var $ipAddress = '192.168.4.146';
+var $ipAddress = 'localhost';
 var $port = '9090';

diff --git a/vemserver/config.rb b/vemserver/config.rb
index eb952bb..3cdec1b 100644 (file)
--- a/vemserver/config.rb
+++ b/vemserver/config.rb
@@ -1,8 +1,8 @@
 $:.unshift(File.dirname(__FILE__))
 
-$ip_address  = '192.168.4.146'
+$ip_address  = 'localhost'
 $cs_port     = '3000'
 $vemapi_port = 9090
 $debug       = true
-$em_name     = 'fei'
+$em_name     = 'mock'