 zhangjiaxin
|
51e0e70d85
移动报告导出拼接文件到所在窗体目录下
|
2 years ago |
 gsp
|
ef3ac41168
Merge branch 'release2.31' into Release2.4
|
2 years ago |
 CXS
|
6c958d02aa
execl 谱峰图导出
|
2 years ago |
|
gsp
|
1ddc16000b
Merge branch 'dev' into Release2.4
|
2 years ago |
|
gsp
|
64681fb529
Merge branch 'release2.31' into Release2.4
|
2 years ago |
|
gsp
|
71ac5df303
remove dev activeX component reference.
|
2 years ago |
 zty
|
31f69bc0a1
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
2 years ago |
 gaoshipeng
|
4f1e04b7e1
edit the sln config.
|
2 years ago |
|
gaoshipeng
|
6dcec88000
Merge branch 'Release2.3' into Release2.4
|
2 years ago |
|
CXS
|
7668a38cf1
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
2 years ago |
|
zhangjiaxin
|
63f69cd32b
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
2 years ago |
|
gaoshipeng
|
4905c61cf7
rare earth classification optimize.
|
2 years ago |
|
zhangjiaxin
|
2cb18bbfa5
修改报告程序无标准库名称，修改报告模板配置增加测量放大倍数
|
2 years ago |
|
zhangjiaxin
|
99196d9d2b
增加选择颗粒，报告导出功能
|
2 years ago |
|
gaoshipeng
|
71f174631f
edit the solution and project configuration
|
2 years ago |
|
CXS
|
9680c65288
Merge branch 'dev' into cxs
|
2 years ago |
|
CXS
|
bab90d6978
合并解决冲突
|
2 years ago |
|
CXS
|
bffa59ea53
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
2 years ago |
|
zty
|
9269eac592
修改报告Model位置
|
2 years ago |
|
CXS
|
19e194d26a
Merge branch 'Release2.3' into dev
|
2 years ago |
|
gaoshipeng
|
3aecc2c7f0
add cleannessRelease and lithiumCleanness release config.
|
3 years ago |
|
zty
|
59806a2536
1.更新FEI接口
|
3 years ago |
|
zhangjiaxin
|
44350be220
报告程序更新分布图导出（后台线程，log提示），
|
3 years ago |
|
zhangjiaxin
|
aa6186c008
出去报告中无效颗粒和未识别颗粒
|
3 years ago |
|
gsp
|
103ed4e47f
fix bugs when apply the new ipc tech
|
3 years ago |
|
gsp
|
f407b90a1f
add ipc support for Measure app.
|
3 years ago |
|
zhangjiaxin
|
d2c415d280
清除报告中未识别颗粒字样，增加导出原图拼接功能（导出原图拼接渲染功能没有完成）
|
3 years ago |
|
CXS
|
8b33c89708
1.删除中英文配置文件
|
3 years ago |
|
gsp
|
ceec2285ce
change the opencvsharp to the original version(from dalian)
|
3 years ago |
|
gsp
|
eba57be1c6
delay loading the OTScontrol hardware.
|
3 years ago |
