 gaoshipeng
|
fce6e56aed
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0
|
%!s(int64=3) %!d(string=hai) anos |
|
gaoshipeng
|
358e12335e
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31
|
%!s(int64=3) %!d(string=hai) anos |
|
gaoshipeng
|
56ffb9c94d
set processTime =4 when do xray process in oxford spectrum.
|
%!s(int64=3) %!d(string=hai) anos |
 cxs
|
1b3815717d
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
f51b48368f
去除最小放大倍数>45的限制
|
%!s(int64=3) %!d(string=hai) anos |
|
gaoshipeng
|
c50ef34183
improve the stage moving mechanism . add try enclosure and some log when catching bse image and collectting xray.
|
%!s(int64=3) %!d(string=hai) anos |
|
gaoshipeng
|
86cdeebcfc
improve the stage moving mechanism . add try enclosure and some log when catching bse image and collectting xray.
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
179edd5832
修改导出execl添加默认文件名
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
0e6336a513
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
480d1b7ef5
Merge branch 'cxs_release2.31' into release2.31
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
79b3bfa6a6
恢复国标和国标导出
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
a03b077d96
Merge branch 'cxs_release2.31' into release2.31
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
66252ce604
Merge branch 'cxs_release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into cxs_release2.31
|
%!s(int64=3) %!d(string=hai) anos |
 CXS
|
6c958d02aa
execl 谱峰图导出
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
2eaee67e77
Merge branch 'cxs_release2.31' into release2.31
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
1dd5a6706b
execl 谱峰图导出
|
%!s(int64=3) %!d(string=hai) anos |
|
cxs
|
5ce76a0517
是否导出谱峰图
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
37aee811a6
execl 谱峰图导出
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
5647b11b00
execl 谱图 临时提交
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
f4976ace38
处理 因现有 npoi 版本低导出 输出 execl折线图x，y轴不显示的问题前的备份
|
%!s(int64=3) %!d(string=hai) anos |
 gsp
|
316a808bf4
fix extreme method bugs.
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
4912561c06
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
59a826a482
swap the sequence of Cathium process and Mg process method.
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
a5ed0ea5e2
添加 读取硬度前 启动模式的判断
|
%!s(int64=3) %!d(string=hai) anos |
|
gaoshipeng
|
c393bcb703
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
d6ed986dac
修改导出execl的行高和列宽
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
1de9065c5d
修改导出execl的行高和列宽
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
6caee115ed
添加已分析颗粒和其它颗粒列表
|
%!s(int64=3) %!d(string=hai) anos |
 zhangjiaxin
|
6cd72c0a5f
补充提交
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
63f69cd32b
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
%!s(int64=3) %!d(string=hai) anos |
