require '../vem/vem'
require '../vem/mock'
+require '../vem/feicontrol'
class Request
- def initialize(command, params)
- puts "create request"
- @command = command
- @params = params
- @vem = VEM.create('mock')
- end
+ def initialize(command, params)
+ puts "create request"
+ @command = command
+ @params = params
+ end
- def execute
- case @command
- when "get"
- puts @vem.get_params
- when "stagea"
- puts @vem.set_stageA(@params["x"].to_i, @params["y"].to_i, @params["z"].to_i, @params["a"].to_i)
- when "stager"
- puts @vem.set_stageR(@params["x"].to_i, @params["y"].to_i, @params["z"].to_i, @params["a"].to_i)
- when "acq_init"
- puts @vem.acquisition_init(@params["bng"].to_i, @params["exp"], @params["size"].to_i)
- when "acq"
- puts @vem.acquisition
- else
- end
- end
+
+ def execute
+ puts "execute"
+ @vem = VEM.create("fei")
+ case @command
+ when "get"
+ puts @vem.get_params
+ when "stagea"
+ puts @vem.set_stageA(@params["x"].to_i, @params["y"].to_i, @params["z"].to_i, @params["a"].to_i)
+ when "stager"
+ puts @vem.set_stageR(@params["x"].to_i, @params["y"].to_i, @params["z"].to_i, @params["a"].to_i)
+ when "acq_init"
+ puts @vem.acquisition_init(@params["bng"].to_i, @params["exp"], @params["size"].to_i)
+ when "acq"
+ puts @vem.acquisition
+ else
+ end
+ end
end
$:.unshift(File.dirname(__FILE__))
require 'sinatra/base'
-<<<<<<< HEAD
-require '../vem/vem'
-require '../vem/mock'
-begin
- require '../vem/feicontrol'
-rescue LoadError
-end
-#require 'vem/jeolcontrol'
-#require './vem/hitachicontrol'
-
-class Vemapi < Sinatra::Base
-
- # @@vem = nil
-=======
require './channel'
require './request'
class Vemapi < Sinatra::Base
- @@channel = Channel.instance
->>>>>>> e5709e205eb16649d7ad3d8185a6989021f6696a
-
- get '/' do
- headers \
- "Access-Control-Allow-origin" => "*"
- 'VEM API test'
- end
-
-<<<<<<< HEAD
-
- get '/:emname/init' do
- headers \
- "Access-Control-Allow-origin" => "*"
-
- if settings.development?
- vem = VEM.create("mock")
- print "created mock instance"
- else
- vem = VEM.create(params[:emname])
- print "created #{params[:emname]} instance"
- end
-
- return "created #{params[:emname]} instance"
- end
-
-
- get '/:emname/get' do
- headers \
- "Access-Control-Allow-origin" => "*"
-
- if settings.development?
- vem = VEM.create("mock")
- print "created mock instance"
- else
- vem = VEM.create(params[:emname])
- print "created #{params[:emname]} instance"
- end
-
- result = vem.get_params
- "#{result}"
- end
-
-
- get '/:emname/set/stagea' do
- headers \
- "Access-Control-Allow-origin" => "*"
- if settings.development?
- vem = VEM.create("mock")
- print "created mock instance"
- else
- vem = VEM.create(params[:emname])
- print "created #{params[:emname]} instance"
- end
-
-result = vem.set_stageA(params["x"].to_i, params["y"].to_i, params["z"].to_i, params["a"].to_i)
- "#{result}"
- end
-
-
- get '/:emname/set/stager' do
- headers \
- "Access-Control-Allow-origin" => "*"
- result = @@vem.set_stageR(params["x"].to_i, params["y"].to_i, params["z"].to_i, params["a"].to_i)
- "#{result}"
- end
-
- get '/:emname/set/acq' do
- headers \
- "Access-Control-Allow-origin" => "*"
- result = @@vem.acquisition_init(params["bin"].to_i, params["expt"].to_i, params["size"].to_i)
- "#{result}"
-=======
- get '/:emname/get' do
- headers \
- "Access-Control-Allow-origin" => "*"
- request = Request.new("get", nil)
- @@channel.put_request(request)
- end
-
- get '/:emname/set/:command' do
- headers \
- "Access-Control-Allow-origin" => "*"
- request = Request.new(params["command"], params)
- @@channel.put_request(request)
->>>>>>> e5709e205eb16649d7ad3d8185a6989021f6696a
- end
-
- get '/:emname/acq' do
- headers \
- "Access-Control-Allow-origin" => "*"
-<<<<<<< HEAD
- result = @@vem.acquisition
- "#{result}"
- end
-
-end
-
-=======
- request = Request.new(params["command"], params)
- @@channel.put_request(request)
- end
+ set : production
+ @@channel = Channel.instance
+
+ get '/' do
+ headers \
+ "Access-Control-Allow-origin" => "*"
+ 'VEM API test'
+ end
+
+ get '/:emname/get' do
+ headers \
+ "Access-Control-Allow-origin" => "*"
+ request = Request.new("get", nil)
+ @@channel.put_request(request)
+ end
+
+ get '/:emname/set/:command' do
+ headers \
+ "Access-Control-Allow-origin" => "*"
+ request = Request.new(params["command"], params)
+ @@channel.put_request(request)
+ end
+
+ get '/:emname/acq' do
+ headers \
+ "Access-Control-Allow-origin" => "*"
+ request = Request.new(params["command"], params)
+ @@channel.put_request(request)
+ end
end
channel = Channel.instance
channel.start_worker
Vemapi.run! :host => '192.168.4.145', :port => 9090
->>>>>>> e5709e205eb16649d7ad3d8185a6989021f6696a