clean

diff --git a/vemserver/.config.ru.un~ b/vemserver/.config.ru.un~
new file mode 100644 (file)
index 0000000..6c76946
Binary files /dev/null and b/vemserver/.config.ru.un~ differ

diff --git a/vemserver/.thread.rb.un~ b/vemserver/.thread.rb.un~
new file mode 100644 (file)
index 0000000..775a98c
Binary files /dev/null and b/vemserver/.thread.rb.un~ differ

diff --git a/vemserver/.vemapi2.rb.un~ b/vemserver/.vemapi2.rb.un~
new file mode 100644 (file)
index 0000000..262493f
Binary files /dev/null and b/vemserver/.vemapi2.rb.un~ differ

diff --git a/vemserver/config.ru b/vemserver/config.ru
new file mode 100644 (file)
index 0000000..213d6be
--- /dev/null
+++ b/vemserver/config.ru
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby -I c:/Users/iwasaki/gem/sinatra-master/lib -I lib
+
+require 'sinatra/base'
+require File.expand_path('../vemapi.rb', __FILE__)
+
+run Vemapi

diff --git a/vemserver/config.ru~ b/vemserver/config.ru~
new file mode 100644 (file)
index 0000000..a981543
--- /dev/null
+++ b/vemserver/config.ru~
@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby -I c:/Users/iwasaki/gem/sinatra-master/lib -I lib
+
+require 'sinatra'
+require File.expand_path('../vemapi.rb', __FILE__)
+
+run Vemapi

diff --git a/vemserver/thread.rb b/vemserver/thread.rb
new file mode 100644 (file)
index 0000000..7799cab
--- /dev/null
+++ b/vemserver/thread.rb
@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby -I c:/Users/iwasaki/gem/sinatra-master/lib -I lib
+
+require './vemapi2'
+
+#pid = spawn 'ruby', 'vemapi2.rb', :out => 'log'
+
+t = Thread.new do
+Vemapi.run! :host => '192.168.4.146', :port => 9090
+end
+
+

diff --git a/vemserver/thread.rb~ b/vemserver/thread.rb~
new file mode 100644 (file)
index 0000000..721e103
--- /dev/null
+++ b/vemserver/thread.rb~
@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby -I c:/Users/iwasaki/gem/sinatra-master/lib -I lib
+
+require './vemapi2'
+
+#pid = spawn 'ruby', 'vemapi2.rb', :out => 'log'
+
+Vemapi.run! :host => '192.168.4.146', :port => 9090
+

diff --git a/vemserver/vemapi2.rb b/vemserver/vemapi2.rb
new file mode 100644 (file)
index 0000000..46472ba
--- /dev/null
+++ b/vemserver/vemapi2.rb
@@ -0,0 +1,98 @@
+#!/usr/bin/env ruby -I c:/Users/iwasaki/gem/sinatra-master/lib -I lib
+
+$:.unshift(File.dirname(__FILE__))
+
+require 'sinatra/base'
+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
+
+  get '/' do
+    headers \
+      "Access-Control-Allow-origin" => "*"
+    'VEM API test'
+  end
+
+
+  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}"
+  end
+
+  get '/:emname/acq' do
+    headers \
+      "Access-Control-Allow-origin" => "*"
+    result = @@vem.acquisition
+    "#{result}"
+  end
+
+end
+
+

diff --git a/vemserver/vemapi2.rb~ b/vemserver/vemapi2.rb~
new file mode 100644 (file)
index 0000000..addc352
--- /dev/null
+++ b/vemserver/vemapi2.rb~
@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby -I c:/Users/iwasaki/gem/sinatra-master/lib -I lib
+
+$:.unshift(File.dirname(__FILE__))
+
+require 'sinatra/base'
+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
+
+  get '/' do
+    headers \
+      "Access-Control-Allow-origin" => "*"
+    'VEM API test'
+  end
+
+
+  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}"
+  end
+
+  get '/:emname/acq' do
+    headers \
+      "Access-Control-Allow-origin" => "*"
+    result = @@vem.acquisition
+    "#{result}"
+  end
+
+end
+
+Vemapi.run! :host => '192.168.4.145', :port => 9090
+