 zhangjiaxin
|
d2c415d280
清除报告中未识别颗粒字样，增加导出原图拼接功能（导出原图拼接渲染功能没有完成）
|
%!s(int64=3) %!d(string=hai) anos |
 CXS
|
8b33c89708
1.删除中英文配置文件
|
%!s(int64=3) %!d(string=hai) anos |
 gsp
|
ceec2285ce
change the opencvsharp to the original version(from dalian)
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
eba57be1c6
delay loading the OTScontrol hardware.
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
55888b0a42
degrade the framework version to 4.6.2
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
2953cdcef5
生成时添加exe图标
|
%!s(int64=4) %!d(string=hai) anos |
|
CXS
|
d04fae1eca
Merge branch 'dev' into cxs
|
%!s(int64=4) %!d(string=hai) anos |
|
CXS
|
1ce3798a1f
报告程序添加帮助界面说明
|
%!s(int64=4) %!d(string=hai) anos |
 lizhongsys
|
8857871c35
diagnose the si and other material recognize
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
1669c3bcc4
add filter particle function .
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
b1179360df
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
dd95094e1a
change the "sampledata" to "samplepropertyData"
|
%!s(int64=4) %!d(string=hai) anos |
|
zhangjiaxin
|
0037692dbf
合并dev提交
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
9e20032f53
make a refactor on reportapp code structure.
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
a8d0a64260
improve the efficient of the distribution image.
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
0477c2e845
Merge branch 'release2.2' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.2
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
708123761e
optimize the operating speed of aliment image.
|
%!s(int64=4) %!d(string=hai) anos |
|
zhangjiaxin
|
2d40c1c385
修改报表元素分布表的格式，元素增加至14个元素，另外增加元素分布表已字符串的形式显示全部元素信息；增加国标导出报表功能；
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
60715b4f8d
edit gb calculate method and refactor the structure.
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
4f38b25472
edit the gb files in cpp part.
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
c6cdd667ed
edit the first edition of gbcalculate code.
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
1ae57ba876
Merge branch 'dev' into GSP
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
7dc53ae191
merging the GB project into report application
|
%!s(int64=4) %!d(string=hai) anos |
 shiyanshi
|
9021c0c942
Merge branch 'release2.1' into dev
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
da32102403
doesn't DisConnect the sem after reading or writing data to bruker device untill exit the whole application.
|
%!s(int64=4) %!d(string=hai) anos |
|
zhangjiaxin
|
833868071c
增加报告程序，粒级表右键新建功能
|
%!s(int64=4) %!d(string=hai) anos |
|
zhangjiaxin
|
8a107635b4
修改优化报告程序函数名称删除无用的注释
|
%!s(int64=4) %!d(string=hai) anos |
|
gsp
|
d695f2b3e3
add ots2_0 new files after testing FEI in Beijing.
|
%!s(int64=4) %!d(string=hai) anos |
