 cxs
|
830d17ae66
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
956dd7e6f6
新增样品台Axia七孔70mm
|
%!s(int64=2) %!d(string=hai) anos |
 gsp
|
25d29aa442
change the generate path of OTSIncAReportTemplate.csproj(debug)
|
%!s(int64=2) %!d(string=hai) anos |
 gaoshipeng
|
8532b2c333
change the generate path of OTSIncAReportTemplate.csproj
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
5ed2ee019f
Merge branch 'Release2.4' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
8a5cd41f1b
fix the magnification display problem.Originally it will change for the float datatype.
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
07e3a503d4
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
009e41b38a
Merge branch 'Release2.4' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
8dd6d78d86
optimize the measure flow.
|
%!s(int64=2) %!d(string=hai) anos |
 zhangjiaxin
|
bc80225018
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
zhangjiaxin
|
5544759223
修复报告程序多个样品，查看国标时切换失败的问题（c#部分代码），修复报告程序报告导出时颗粒列表显示与实际不一致的问题。
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
e1f53976e5
删除取图方式中随机选项
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
d563717a6c
optimize the measure flow.(do not recalculate the field center position of one sample). restore the semstate of sem after the doholepreview operation.
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
d5a4ab52b2
Merge branch 'Release2.4' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
bf02a0274b
处理 排列图和分布图记录颗粒列表浅拷贝的问题
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
590f74a236
fix the report export problem.
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
170d1378f9
improve gb30834.fix some tiny problem.
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
d4d40f0848
Merge branch 'Release2.4' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
gsp
|
ddb9553b70
improve GB 30834 algorithm.
|
%!s(int64=2) %!d(string=hai) anos |
 GZ
|
8f70ce69c7
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
GZ
|
703a03eb19
add g_nXrayControllerConnectTimeOutMilliSeconds and g_nStageTimeOutMilliSecond
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
375df08a61
报告颗粒列表去Fe
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
b43426d2da
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
78fb91c11c
处理报告颗粒齿唇列表数据重复的bug
|
%!s(int64=2) %!d(string=hai) anos |
 zty
|
3c34ccb94b
Merge branch 'Release2.4' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
zty
|
7f3d8d6863
修复三元相图打不开的bug
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
5cf7bc6670
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
cxs
|
2e63f08fd6
处理科学计数法无法导出报告的问题
|
%!s(int64=2) %!d(string=hai) anos |
|
GZ
|
3498a6c026
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.4
|
%!s(int64=2) %!d(string=hai) anos |
|
GZ
|
495b7e4d5d
fix bug which classify error
|
%!s(int64=2) %!d(string=hai) anos |
