 zhangjiaxin
|
cad0a04cf9
Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.5
|
2 gadi atpakaļ |
|
zhangjiaxin
|
b14431350b
报表增加页码显示，修复增加分类图形选择（代码里操控）
|
2 gadi atpakaļ |
 cxs
|
96b13957fb
调整语言为中文
|
2 gadi atpakaļ |
|
cxs
|
90e2490108
自定义标准库提示变英语
|
2 gadi atpakaļ |
|
cxs
|
765193564c
Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.5
|
2 gadi atpakaļ |
|
cxs
|
199ad741f7
1.处理只有一条规则时，向下调整规则按钮不置灰的bug
|
2 gadi atpakaļ |
|
zhangjiaxin
|
482afc4a0f
Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.5
|
2 gadi atpakaļ |
|
zhangjiaxin
|
a302ed8304
移动报告程序的配置文件至config文件路径下下，三元图需改以完毕
|
2 gadi atpakaļ |
|
cxs
|
bc3ab09ace
1.重新梳理颗粒列表数据源类型，添加拼接颗粒子列表
|
2 gadi atpakaļ |
|
zhangjiaxin
|
6aa6c3e865
Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.5
|
2 gadi atpakaļ |
|
cxs
|
386e274eab
修正颗粒列表进度条位置
|
2 gadi atpakaļ |
 gsp
|
5e0c55b43b
edit code format
|
2 gadi atpakaļ |
|
zhangjiaxin
|
078db84057
Merge branch 'Release2.5' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.5
|
2 gadi atpakaļ |
|
zhangjiaxin
|
36e922995a
修改三元图的显示，增加标尺
|
2 gadi atpakaļ |
|
gsp
|
c367c4b321
optimize the originalImages display method.
|
2 gadi atpakaļ |
|
gsp
|
d67670d37e
optimize the particle display method in BSE mode.(change to call DrawIamge method)
|
2 gadi atpakaļ |
|
cxs
|
e39605a42d
修改矿物数据库转换器的bug
|
2 gadi atpakaļ |
|
cxs
|
1e95c19234
修改bug --多样品某些样品不显示测量结果的bug
|
3 gadi atpakaļ |
|
cxs
|
33075f2152
Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5
|
3 gadi atpakaļ |
|
cxs
|
e09549ef8d
三元相图更改为三元图
|
3 gadi atpakaļ |
|
gsp
|
a637836687
Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5
|
3 gadi atpakaļ |
|
gsp
|
e1419fae3e
optimize GroupClassify method
|
3 gadi atpakaļ |
|
zhangjiaxin
|
591f1c3cf6
报告程序，报告导出除物质分类
|
3 gadi atpakaļ |
|
gsp
|
976c9a0a73
Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5
|
3 gadi atpakaļ |
|
gsp
|
b4e115cc22
optimize the OTSCPP/OTSClassifyEngine/InclutionEngine/OTSClassifyEng.cpp code.
|
3 gadi atpakaļ |
|
zhangjiaxin
|
8e8bb70d59
Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5
|
3 gadi atpakaļ |
|
zhangjiaxin
|
52df6139d6
修改国标DS类的Grade列排序的问题
|
3 gadi atpakaļ |
|
cxs
|
d190499122
修改MnS颜色
|
3 gadi atpakaļ |
|
cxs
|
c8e5596493
在报告程序中 添加 常量 无效颗粒=-1 以便于维护
|
3 gadi atpakaļ |
|
cxs
|
145d37b178
Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.5
|
3 gadi atpakaļ |
