 gaoshipeng
|
d24410e859
Merge branch 'release2.31' into Release2.4
|
3 gadi atpakaļ |
|
gaoshipeng
|
fce6e56aed
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0
|
3 gadi atpakaļ |
|
gaoshipeng
|
358e12335e
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31
|
3 gadi atpakaļ |
|
gaoshipeng
|
56ffb9c94d
set processTime =4 when do xray process in oxford spectrum.
|
3 gadi atpakaļ |
 cxs
|
1b3815717d
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31
|
3 gadi atpakaļ |
|
cxs
|
f51b48368f
去除最小放大倍数>45的限制
|
3 gadi atpakaļ |
|
gaoshipeng
|
c50ef34183
improve the stage moving mechanism . add try enclosure and some log when catching bse image and collectting xray.
|
3 gadi atpakaļ |
|
gaoshipeng
|
046799b869
Merge branch 'release2.31' into Release2.4
|
3 gadi atpakaļ |
|
gaoshipeng
|
86cdeebcfc
improve the stage moving mechanism . add try enclosure and some log when catching bse image and collectting xray.
|
3 gadi atpakaļ |
|
cxs
|
179edd5832
修改导出execl添加默认文件名
|
3 gadi atpakaļ |
|
cxs
|
987d22c9da
修改颗粒导出execl添加默认文件名称
|
3 gadi atpakaļ |
|
cxs
|
c2956116af
修改国标2导出报错bug
|
3 gadi atpakaļ |
 gsp
|
ef3ac41168
Merge branch 'release2.31' into Release2.4
|
3 gadi atpakaļ |
|
cxs
|
0e6336a513
Merge branch 'release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into release2.31
|
3 gadi atpakaļ |
|
cxs
|
480d1b7ef5
Merge branch 'cxs_release2.31' into release2.31
|
3 gadi atpakaļ |
|
cxs
|
79b3bfa6a6
恢复国标和国标导出
|
3 gadi atpakaļ |
|
cxs
|
a03b077d96
Merge branch 'cxs_release2.31' into release2.31
|
3 gadi atpakaļ |
|
cxs
|
66252ce604
Merge branch 'cxs_release2.31' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into cxs_release2.31
|
3 gadi atpakaļ |
 CXS
|
6c958d02aa
execl 谱峰图导出
|
3 gadi atpakaļ |
|
cxs
|
2eaee67e77
Merge branch 'cxs_release2.31' into release2.31
|
3 gadi atpakaļ |
|
CXS
|
1dd5a6706b
execl 谱峰图导出
|
3 gadi atpakaļ |
|
cxs
|
5ce76a0517
是否导出谱峰图
|
3 gadi atpakaļ |
|
gsp
|
e6fb0d4bd9
Merge branch 'dev' into Release2.4
|
3 gadi atpakaļ |
|
CXS
|
37aee811a6
execl 谱峰图导出
|
3 gadi atpakaļ |
|
CXS
|
5647b11b00
execl 谱图 临时提交
|
3 gadi atpakaļ |
|
CXS
|
f4976ace38
处理 因现有 npoi 版本低导出 输出 execl折线图x，y轴不显示的问题前的备份
|
3 gadi atpakaļ |
|
gsp
|
9c9e3bb9c8
improve the visualizing work flow of SpecialParticleForm window.
|
3 gadi atpakaļ |
 zty
|
3dd9d38cf7
1.修复不能取消颗粒分离的bug
|
3 gadi atpakaļ |
|
gsp
|
1ddc16000b
Merge branch 'dev' into Release2.4
|
3 gadi atpakaļ |
|
gsp
|
3d86823b8f
Merge branch 'Release2.4' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.4
|
3 gadi atpakaļ |
