execute threadworker by fei

diff --git a/vem/.feicontrol.rb.un~ b/vem/.feicontrol.rb.un~
index fc2a49d..b5dd092 100644 (file)
Binary files a/vem/.feicontrol.rb.un~ and b/vem/.feicontrol.rb.un~ differ

diff --git a/vem/feicontrol.rb b/vem/feicontrol.rb
index 43cf9dc..ff9a7c9 100644 (file)
--- a/vem/feicontrol.rb
+++ b/vem/feicontrol.rb
@@ -41,12 +41,15 @@ class FEIControl < VEM
        def get_params
                puts "FEI get params"
 
-               @@tem = TEMObject.instance      
+               @@tem = TEMObject.instance
+
+               puts @@tem.Stage
 
                @@params["x"] = @@tem.Stage.Position.X
                @@params["y"] = @@tem.Stage.Position.Y
                @@params["z"] = @@tem.Stage.Position.Z
                @@params["a"] = @@tem.Stage.Position.A
+
                return @@params
        end
 

diff --git a/vem/feicontrol.rb~ b/vem/feicontrol.rb~
index bb9cdfc..77e81ea 100644 (file)
--- a/vem/feicontrol.rb~
+++ b/vem/feicontrol.rb~
@@ -41,14 +41,14 @@ class FEIControl < VEM
        def get_params
                puts "FEI get params"
 
-               @@tem = TEMObject.instance      
-               puts @@tem.Stage
-
+               @@tem = TEMObject.instance
+               
+               puts @@tem
 
-#              @@params["x"] = @@tem.Stage.Position.X
-#              @@params["y"] = @@tem.Stage.Position.Y
-#              @@params["z"] = @@tem.Stage.Position.Z
-#              @@params["a"] = @@tem.Stage.Position.A
+               @@params["x"] = @@tem.Stage.Position.X
+               @@params["y"] = @@tem.Stage.Position.Y
+               @@params["z"] = @@tem.Stage.Position.Z
+               @@params["a"] = @@tem.Stage.Position.A
                return @@params
        end
 

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

diff --git a/vemserver/.vemapi2.rb.un~ b/vemserver/.vemapi2.rb.un~
index 87cd1d0..cc77da9 100644 (file)
Binary files a/vemserver/.vemapi2.rb.un~ and b/vemserver/.vemapi2.rb.un~ differ

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

diff --git a/vemserver/config.ru b/vemserver/config.ru
deleted file mode 100644 (file)
index 213d6be..0000000
--- a/vemserver/config.ru
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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~
deleted file mode 100644 (file)
index a981543..0000000
--- a/vemserver/config.ru~
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/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/request.rb b/vemserver/request.rb
index 259caa6..55e035c 100644 (file)
--- a/vemserver/request.rb
+++ b/vemserver/request.rb
@@ -1,27 +1,30 @@
 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

diff --git a/vemserver/request.rb~ b/vemserver/request.rb~
new file mode 100644 (file)
index 0000000..c69803e
--- /dev/null
+++ b/vemserver/request.rb~
@@ -0,0 +1,30 @@
+require '../vem/vem'
+require '../vem/mock'
+require '../vem/feicontrol'
+
+class Request
+       def initialize(command, params)
+               puts "create request"
+               @command = command
+               @params  = params
+       end
+
+
+       def execute
+               puts "execute"
+               @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

diff --git a/vemserver/thread.rb b/vemserver/thread.rb
deleted file mode 100644 (file)
index 7799cab..0000000
--- a/vemserver/thread.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/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~
deleted file mode 100644 (file)
index 721e103..0000000
--- a/vemserver/thread.rb~
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/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~
index e10c3b0..66c56b2 100644 (file)
--- a/vemserver/vemapi2.rb~
+++ b/vemserver/vemapi2.rb~
@@ -3,130 +3,42 @@
 $:.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
 

diff --git a/vemserver/workerThread.rb b/vemserver/workerThread.rb
index b0a252d..0f9c19d 100644 (file)
--- a/vemserver/workerThread.rb
+++ b/vemserver/workerThread.rb
@@ -1,5 +1,7 @@
 require 'singleton'
 require './channel'
+require '../vem/vem'
+require '../vem/feicontrol'
 
 class WorkerThread
 
@@ -11,6 +13,7 @@ class WorkerThread
     puts "worker_thread start"
     Thread.new do
       while true do
+             puts "true"
         request = @channel.take_request
         request.execute
       end

diff --git a/vemserver/workerThread.rb~ b/vemserver/workerThread.rb~
new file mode 100644 (file)
index 0000000..0f9c19d
--- /dev/null
+++ b/vemserver/workerThread.rb~
@@ -0,0 +1,22 @@
+require 'singleton'
+require './channel'
+require '../vem/vem'
+require '../vem/feicontrol'
+
+class WorkerThread
+
+  def initialize(channel)
+    @channel = channel
+  end
+
+  def start
+    puts "worker_thread start"
+    Thread.new do
+      while true do
+             puts "true"
+        request = @channel.take_request
+        request.execute
+      end
+    end
+  end
+end