OSDN Git Service
summary |
shortlog | log |
commit |
commitdiff |
tree
first ⋅ prev ⋅ next
YamamotoTakayuki [Wed, 14 Feb 2018 18:15:18 +0000 (03:15 +0900)]
add function for CLEM
iwasaki [Fri, 25 Mar 2016 18:56:06 +0000 (03:56 +0900)]
modify doc/readmetxt
iwasaki [Fri, 25 Mar 2016 18:48:51 +0000 (03:48 +0900)]
modify doc/readme.txt
iwasaki [Fri, 25 Mar 2016 18:41:42 +0000 (03:41 +0900)]
create doc/readme.txt
iwasaki [Thu, 24 Mar 2016 07:59:07 +0000 (16:59 +0900)]
rm doc/bootstrap
ayaka [Tue, 16 Feb 2016 18:27:07 +0000 (03:27 +0900)]
create mock get_vacuum_status
iwasaki [Tue, 16 Feb 2016 17:57:00 +0000 (02:57 +0900)]
create get_vacuum_state
iwasaki [Tue, 16 Feb 2016 17:32:46 +0000 (02:32 +0900)]
modify by fei
ayaka [Tue, 16 Feb 2016 06:07:33 +0000 (15:07 +0900)]
modify vemapi.txt
ayaka [Tue, 16 Feb 2016 06:03:45 +0000 (15:03 +0900)]
modify vemapi.rb
iwasaki [Thu, 4 Feb 2016 09:31:25 +0000 (18:31 +0900)]
Merge branch 'master' of ssh://192.168.5.128:/Users/iwasaki/vem
iwasaki [Thu, 4 Feb 2016 09:31:01 +0000 (18:31 +0900)]
commit by fei
ayaka [Fri, 29 Jan 2016 23:31:24 +0000 (08:31 +0900)]
modify view
iwasaki [Thu, 28 Jan 2016 15:58:57 +0000 (00:58 +0900)]
commit by fei
ayaka [Thu, 28 Jan 2016 15:40:47 +0000 (00:40 +0900)]
create cameraHost
ayaka [Sun, 24 Jan 2016 11:56:41 +0000 (20:56 +0900)]
create mds2
iwasaki [Tue, 19 Jan 2016 01:51:22 +0000 (10:51 +0900)]
Merge branch 'master' of ssh://192.168.5.213:/opt/git/vem
iwasaki [Tue, 19 Jan 2016 01:51:07 +0000 (10:51 +0900)]
fix by fei
ayaka [Mon, 18 Jan 2016 09:51:53 +0000 (18:51 +0900)]
try commit for feiq
ayaka [Sun, 17 Jan 2016 06:10:19 +0000 (15:10 +0900)]
Merge branch 'master' of ssh://gitserver:/opt/git/vem
iwasaki [Sun, 17 Jan 2016 06:09:04 +0000 (15:09 +0900)]
speed up serialCamera
ayaka [Fri, 15 Jan 2016 10:49:49 +0000 (19:49 +0900)]
create config_template.rb
ayaka [Fri, 15 Jan 2016 02:24:20 +0000 (11:24 +0900)]
modify .gitignore
ayaka [Fri, 15 Jan 2016 02:11:22 +0000 (11:11 +0900)]
create gitignore
iwasaki [Thu, 14 Jan 2016 01:55:20 +0000 (10:55 +0900)]
Merge branch 'master' of ssh://192.168.5.213:/opt/git/vem
iwasaki [Thu, 14 Jan 2016 01:54:46 +0000 (10:54 +0900)]
modify by fei
ayaka [Wed, 13 Jan 2016 08:39:03 +0000 (17:39 +0900)]
modify mds & doc vemapi.txt
ayaka [Mon, 11 Jan 2016 04:43:37 +0000 (13:43 +0900)]
Merge branch 'master' of ssh://gitserver:/opt/git/vem
ayaka [Mon, 11 Jan 2016 04:43:23 +0000 (13:43 +0900)]
make mds dir
iwasaki [Sat, 9 Jan 2016 17:57:30 +0000 (02:57 +0900)]
fix for speed up
iwasaki [Thu, 7 Jan 2016 17:44:03 +0000 (02:44 +0900)]
add fei function
ayaka [Thu, 7 Jan 2016 05:43:06 +0000 (14:43 +0900)]
add 'thin' in Gemfile
ayaka [Wed, 6 Jan 2016 12:53:42 +0000 (21:53 +0900)]
modify doc
ayaka [Wed, 6 Jan 2016 12:34:57 +0000 (21:34 +0900)]
rm test/timeMeas/Rakefile, acqTest.rb
iwasaki [Wed, 6 Jan 2016 05:51:50 +0000 (14:51 +0900)]
modify request for add spotsizeA&R magnificationA&R
iwasaki [Wed, 6 Jan 2016 05:44:55 +0000 (14:44 +0900)]
add vem function(spotsize & magnification, A, R)
ayaka [Wed, 6 Jan 2016 05:30:40 +0000 (14:30 +0900)]
add vemapi function(spotsize & magnification)
iwasaki [Wed, 6 Jan 2016 05:21:32 +0000 (14:21 +0900)]
modify by fei
ayaka [Thu, 24 Dec 2015 06:20:36 +0000 (15:20 +0900)]
modify em @params
ayaka [Wed, 23 Dec 2015 11:11:30 +0000 (20:11 +0900)]
create how to use cameraSocket
ayaka [Wed, 23 Dec 2015 11:00:48 +0000 (20:00 +0900)]
modify doc
ayaka [Tue, 22 Dec 2015 13:36:46 +0000 (22:36 +0900)]
Merge branch 'master' of ssh://gitserver:/opt/git/vem
ayaka [Tue, 22 Dec 2015 13:35:56 +0000 (22:35 +0900)]
modify acqTest & image
ayaka [Tue, 22 Dec 2015 04:08:09 +0000 (13:08 +0900)]
modify acqTest.js
iwasaki [Fri, 18 Dec 2015 20:30:38 +0000 (05:30 +0900)]
measure acq time(time2.txt)
ayaka [Fri, 18 Dec 2015 20:09:34 +0000 (05:09 +0900)]
modify many file
ayaka [Thu, 17 Dec 2015 13:32:44 +0000 (22:32 +0900)]
modify by mac
iwasaki [Thu, 17 Dec 2015 11:35:06 +0000 (20:35 +0900)]
measure the time
iwasaki [Thu, 17 Dec 2015 10:41:13 +0000 (19:41 +0900)]
mkdir vemTest
iwasaki [Thu, 17 Dec 2015 10:19:57 +0000 (19:19 +0900)]
fix by fei
ayaka [Thu, 17 Dec 2015 06:46:23 +0000 (15:46 +0900)]
arrangement file
iwasaki [Tue, 15 Dec 2015 00:33:28 +0000 (09:33 +0900)]
fix by fei pc
ayaka [Mon, 14 Dec 2015 23:56:14 +0000 (08:56 +0900)]
fix future patarn
ayaka [Mon, 14 Dec 2015 04:18:11 +0000 (13:18 +0900)]
modify
iwasaki [Fri, 11 Dec 2015 14:05:38 +0000 (23:05 +0900)]
execute threadworker by fei
iwasaki [Fri, 11 Dec 2015 13:42:17 +0000 (22:42 +0900)]
merge
ayaka [Fri, 11 Dec 2015 13:27:59 +0000 (22:27 +0900)]
vemapi2.rb worker-thread
ayaka [Fri, 11 Dec 2015 13:24:47 +0000 (22:24 +0900)]
vemapi2.rb myway
iwasaki [Thu, 10 Dec 2015 09:57:34 +0000 (18:57 +0900)]
clean
ayaka [Thu, 10 Dec 2015 09:52:05 +0000 (18:52 +0900)]
vemapi2.rb
iwasaki [Wed, 9 Dec 2015 00:26:06 +0000 (09:26 +0900)]
modify by FEI
ayaka [Tue, 8 Dec 2015 21:23:40 +0000 (06:23 +0900)]
modify
ayaka [Tue, 8 Dec 2015 01:42:44 +0000 (10:42 +0900)]
modify mock.rb interface
ayaka [Tue, 8 Dec 2015 00:39:05 +0000 (09:39 +0900)]
create test programs
iwasaki [Tue, 1 Dec 2015 09:40:58 +0000 (18:40 +0900)]
sync iwasaki mac
iwasaki [Mon, 30 Nov 2015 08:11:47 +0000 (17:11 +0900)]
syncro for iwasaki_mac
ayaka [Mon, 30 Nov 2015 08:03:01 +0000 (17:03 +0900)]
for fei transfer
ayaka [Wed, 11 Nov 2015 22:05:31 +0000 (07:05 +0900)]
カメラサーバーとviewを変更
ayaka [Tue, 10 Nov 2015 09:54:40 +0000 (18:54 +0900)]
Merge branch 'master' of ssh://gitserver:/opt/git/vem
ayaka [Tue, 10 Nov 2015 09:52:18 +0000 (18:52 +0900)]
モック用のサーバーで電顕写真を送るようにした&画像表示のバグを修正した
iwasaki [Thu, 5 Nov 2015 03:07:00 +0000 (12:07 +0900)]
modify caemeraServer.rb & feicontrol.rb
ayaka [Thu, 5 Nov 2015 02:47:24 +0000 (11:47 +0900)]
add vem
ayaka [Thu, 5 Nov 2015 02:46:21 +0000 (11:46 +0900)]
rm vem
ayaka [Thu, 5 Nov 2015 02:31:41 +0000 (11:31 +0900)]
change Gemfile's locate
ayaka [Fri, 30 Oct 2015 06:32:56 +0000 (15:32 +0900)]
create vemapi.txt
ayaka [Fri, 23 Oct 2015 05:54:48 +0000 (14:54 +0900)]
modify all
ayaka [Fri, 23 Oct 2015 05:47:34 +0000 (14:47 +0900)]
modify all
iwasaki [Fri, 2 Oct 2015 06:22:59 +0000 (08:22 +0200)]
create cameraServer & modify feicontrol.rb
iwasaki [Fri, 25 Sep 2015 06:55:23 +0000 (08:55 +0200)]
rm many file
iwasaki [Fri, 25 Sep 2015 06:54:15 +0000 (08:54 +0200)]
clean directory: divide vem&vemapi
ayaka [Thu, 24 Sep 2015 11:26:29 +0000 (20:26 +0900)]
clean directory
iwasaki [Fri, 11 Sep 2015 15:07:03 +0000 (17:07 +0200)]
modify feicontrol.rb from FEI_PC
iwasaki [Thu, 10 Sep 2015 21:11:05 +0000 (23:11 +0200)]
modify vemapi from FEI_PC
iwasaki [Thu, 10 Sep 2015 19:01:04 +0000 (21:01 +0200)]
add vemapi
iwasaki [Thu, 10 Sep 2015 19:00:18 +0000 (21:00 +0200)]
rm vemapi
iwasaki [Thu, 10 Sep 2015 18:55:17 +0000 (20:55 +0200)]
modify vemapi
iwasaki [Thu, 10 Sep 2015 18:54:56 +0000 (20:54 +0200)]
rm vemapi
iwasaki [Thu, 10 Sep 2015 18:50:53 +0000 (20:50 +0200)]
add vemapi from FEI_PC
iwasaki [Thu, 10 Sep 2015 18:42:27 +0000 (20:42 +0200)]
first commit from FEI_PC
ayaka [Thu, 10 Sep 2015 07:52:37 +0000 (16:52 +0900)]
test
ayaka [Thu, 23 Jul 2015 00:29:05 +0000 (09:29 +0900)]
first commit
Takuo Yasunaga [Fri, 23 May 2014 21:20:16 +0000 (06:20 +0900)]
Initial commit
Changes to be committed:
new file: feicontrol.rb
new file: hitachicontrol.rb
new file: jeolcontrol.rb
new file: vem.rb
new file: vemserver.rb
OSDN Git Service
