 gsp
|
f4cee77931
add xraylimit function code into the measure flow.
|
4 years ago |
|
gsp
|
75587e1fee
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
gsp
|
a96a8f4174
add emergency STOP_ACQUISITION and xraylimit function.
|
4 years ago |
 CXS
|
79ec2cee55
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
CXS
|
9aca3b67d7
Add ICON WHICH NAMED interrupt
|
4 years ago |
 cxs
|
acdb40a8a8
fix the bug when Disconnect oxford eds device.
|
4 years ago |
|
CXS
|
76d458527b
fix bruker eds problem (1 don't release control rights when measure 2 cann't maintain the rotate angle problem 3 change the point mode batch xray collection to real batch collection not a cycle calling)
|
4 years ago |
|
gsp
|
bb4794e2ea
add log message to setexternal on off.
|
4 years ago |
|
gsp
|
598c855ab1
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
gsp
|
d49da8cf00
rename the namespace OTSPeriodicTable to OTSRptPeriodicTable
|
4 years ago |
|
CXS
|
a750d1033c
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
CXS
|
2c4f498860
Merge branch 'cxs' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into cxs
|
4 years ago |
|
CXS
|
8bc450955a
modify position of icons
|
4 years ago |
|
CXS
|
0cc09d4f95
modify icons
|
4 years ago |
|
gsp
|
629f0e7eac
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
gsp
|
103ed4e47f
fix bugs when apply the new ipc tech
|
4 years ago |
|
gsp
|
4724597862
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
gsp
|
ac7f75923d
delete some useless code.
|
4 years ago |
|
CXS
|
0712b57756
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
CXS
|
72377e9d43
modify some names of buttons
|
4 years ago |
|
gsp
|
fe64016a54
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
gsp
|
3e6f49fa95
change log content.
|
4 years ago |
|
CXS
|
aa74de9271
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
CXS
|
b77f59b7b1
ipc优化
|
4 years ago |
|
gsp
|
0cadfb8a00
improve some log messages.
|
4 years ago |
|
gsp
|
56f1b2753d
add missing files
|
4 years ago |
|
gsp
|
97cee98740
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
4 years ago |
|
gsp
|
280f546eed
apply the singleton pattern to the whole hardware control.
|
4 years ago |
|
CXS
|
41db7a62ed
Merge branch 'cxs' into GSP
|
4 years ago |
|
CXS
|
05106d3a25
change the icons
|
4 years ago |
