 gsp
|
3755c93d75
change to such a mode:only disconnect the sem(eds) after a measure has been finished in the MeasureApp. But in reportApp we disconnect it every time when we control the sem.
|
4 vuotta sitten |
|
gsp
|
66a0609615
remove HardwareConfig.xml from git management for it is always conflict when we merging code.
|
4 vuotta sitten |
|
gsp
|
d7aae5519f
minor improvements on the variable naming and some notation in C#
|
4 vuotta sitten |
 shiyanshi
|
d6e018db1a
fix the bug of relocate particles function in cleanliness system.
|
4 vuotta sitten |
|
shiyanshi
|
e8d5beb5c4
using short connection mode instead of long connection mode.
|
4 vuotta sitten |
|
shiyanshi
|
e089bb0dbf
0927selpa电镜测试，修改点击测量程序中打开报告选项时结束能谱连接的单例模式
|
4 vuotta sitten |
|
gsp
|
460699b0ae
close sem connect before we open the report app.
|
4 vuotta sitten |
|
gsp
|
40a9fef45d
remove pmf and rpt git management
|
4 vuotta sitten |
|
gsp
|
e8a11a5286
Merge branch 'dev' into release2.1
|
4 vuotta sitten |
|
gsp
|
9e41e814d3
change to adopt singleton patter on otscontrol.
|
4 vuotta sitten |
|
gsp
|
5c65ed002c
Merge branch 'release2.1' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.1
|
4 vuotta sitten |
|
gsp
|
557bddc6a7
apply singleton pattern on the OTSControl dll clr interface.
|
4 vuotta sitten |
 CXS
|
4034699032
COMMENT THe repeat useless code
|
4 vuotta sitten |
|
CXS
|
28f85833bc
Merge branch 'dev' into release2.1
|
4 vuotta sitten |
 zhangjiaxin
|
035d446f25
解决分支合并后，报告程序分布图打不开的问题
|
4 vuotta sitten |
|
shiyanshi
|
17edfc16d1
修改合并后出现的bug
|
4 vuotta sitten |
|
shiyanshi
|
f71ef6c806
Merge branch 'release2.1' into dev
|
4 vuotta sitten |
|
shiyanshi
|
5a15f575d2
Merge branch 'release2.1' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.1
|
4 vuotta sitten |
|
gsp
|
72e6fd7221
add missing file .
|
4 vuotta sitten |
|
shiyanshi
|
9021c0c942
Merge branch 'release2.1' into dev
|
4 vuotta sitten |
|
shiyanshi
|
08b3c3f94b
Merge branch 'release2.1' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.1
|
4 vuotta sitten |
|
shiyanshi
|
9a374c9f3e
修改配置文件
|
4 vuotta sitten |
|
shiyanshi
|
c7d2391650
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 vuotta sitten |
|
gsp
|
1706f3de9c
remove some useless code.
|
4 vuotta sitten |
|
CXS
|
c2e800d625
处理 nlog 多次 弹出 的 bug
|
4 vuotta sitten |
|
gsp
|
da32102403
doesn't DisConnect the sem after reading or writing data to bruker device untill exit the whole application.
|
4 vuotta sitten |
|
zhangjiaxin
|
8dac402e1f
Merge branch 'dev' into ZJX
|
4 vuotta sitten |
|
zhangjiaxin
|
a4de893d1c
解决帧图没有坐标位置导致报错的问题（未测试）
|
4 vuotta sitten |
|
CXS
|
986c02d7f5
优化 编辑器 生成 设定
|
4 vuotta sitten |
|
shiyanshi
|
36b55ea40c
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 vuotta sitten |
