 lizhongsys
|
8857871c35
diagnose the si and other material recognize
|
4 years ago |
 gsp
|
60f52e1431
change sqlite db saving method to batch process, optimize the image process.(fix the calxraypos bug of the particle.cpp)
|
4 years ago |
|
gsp
|
532fdda1a7
Merge branch 'Release2.3' into dev
|
4 years ago |
|
gsp
|
f2f13e504c
special gray particle recognize and diagnosis
|
4 years ago |
 CXS
|
58ce3201c3
加密狗 重新分类部分修改
|
4 years ago |
|
gsp
|
363b842297
Merge branch 'Release2.3' into dev
|
4 years ago |
|
gsp
|
d7d72fbfd6
add getspecialgray particles function.
|
4 years ago |
 zhangjiaxin
|
698fc029fb
测量程序打开报告程序，分布图没有加载grid表需要切换，因合并代码是发生的已解决
|
4 years ago |
|
zhangjiaxin
|
5a5160ee41
调整报告程序grid表中的显示顺序
|
4 years ago |
|
zhangjiaxin
|
72e37b49be
完成c++部分，读取xml文档，格式更改的问题，国标部分已可以正常打开
|
4 years ago |
|
zhangjiaxin
|
b316f35550
更改xml文件格式，修改c++部分代码，国标导出部分还有问题尚未处理完，临时提交
|
4 years ago |
|
CXS
|
73e70b4195
修改sourcegrid加载内容
|
4 years ago |
|
zhangjiaxin
|
c0a9a2e961
Merge branch 'ZJX' into Release2.3
|
4 years ago |
|
zhangjiaxin
|
f1da4b6ab0
去除分析数据表中没有用到的选择颗粒选项
|
4 years ago |
|
CXS
|
3c3dcb9aaa
报告程序元素成分选择颗粒为空修改bug
|
4 years ago |
|
CXS
|
743848d7d1
元素成分、颗粒尺寸分布、平均元素成分 选择颗粒功能添加
|
4 years ago |
|
CXS
|
62c9dfbf0a
样品测量信息添加选择颗粒完毕
|
4 years ago |
|
CXS
|
e57a88d109
颗粒成分表选择颗粒功能添加完成
|
4 years ago |
|
CXS
|
225bca179f
测量程序中程序管理修改为checkbox
|
4 years ago |
|
zhangjiaxin
|
bfca514e06
Merge branch 'Release2.3' into ZJX
|
4 years ago |
|
zhangjiaxin
|
6d64513910
修改解决报告编辑界面打不开的问题
|
4 years ago |
|
CXS
|
f4a5eea098
Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.3
|
4 years ago |
|
CXS
|
22a3719934
修改报告概况bug
|
4 years ago |
|
gsp
|
dd045b5c8c
alter the usingXray data to bool type in COTSXRayParam.
|
4 years ago |
|
CXS
|
c7966e3124
Merge branch 'Release2.3' into cxs_dev
|
4 years ago |
|
gsp
|
a9d0ca9f62
Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.3
|
4 years ago |
|
gsp
|
f3f7af5145
remove some useless code.
|
4 years ago |
|
CXS
|
ba0fd4123f
Merge branch 'Release2.3' into cxs_dev
|
4 years ago |
|
zhangjiaxin
|
5f14c2c9e3
解决遗漏的选择颗粒和全部颗粒（Echart三元相图部分）
|
4 years ago |
|
CXS
|
e2161a6953
Merge branch 'Release2.3' into cxs_dev
|
4 years ago |
