 cxs
|
98fc647382
修改一些参数
|
2 éve |
|
cxs
|
b0d6cb5514
Merge branch 'cxs' into Release2.7
|
2 éve |
|
cxs
|
4bea3c149c
添加生成后复制debug中 config和resource 到 release
|
2 éve |
 gsp
|
0d78f3f76e
improve the distribute Image display method.
|
2 éve |
 zhangjiaxin
|
cba9e5d793
修复bug颗粒列表去除多个元素时发生程序报错问题
|
2 éve |
 GZ
|
af71d6a688
fix the bugs when take photo of hole in oxford driver
|
2 éve |
|
gsp
|
d615a7c610
fix oxford reference problem (through modify the proj file)
|
2 éve |
|
gsp
|
8510cdf504
remove the reference of report machine (RM)
|
2 éve |
|
gsp
|
b051d60c85
improve the DeleteSample function.
|
2 éve |
|
gsp
|
e1c2b9a424
Merge branch 'GSP' into Release2.5
|
2 éve |
|
zhangjiaxin
|
51e0e70d85
移动报告导出拼接文件到所在窗体目录下
|
2 éve |
|
zhangjiaxin
|
6bfb20d082
git出现问题临时提交
|
2 éve |
|
zhangjiaxin
|
63dc58c94f
增加国标导出选择功能
|
2 éve |
|
zhangjiaxin
|
501c35ccfb
dev国标导出部分（未完成）
|
2 éve |
|
zhangjiaxin
|
98e69983de
临时提交
|
2 éve |
|
gsp
|
ef3ac41168
Merge branch 'release2.31' into Release2.4
|
2 éve |
 CXS
|
6c958d02aa
execl 谱峰图导出
|
2 éve |
|
gsp
|
1ddc16000b
Merge branch 'dev' into Release2.4
|
2 éve |
|
gsp
|
64681fb529
Merge branch 'release2.31' into Release2.4
|
2 éve |
|
gsp
|
71ac5df303
remove dev activeX component reference.
|
2 éve |
 zty
|
31f69bc0a1
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
2 éve |
 gaoshipeng
|
4f1e04b7e1
edit the sln config.
|
2 éve |
|
gaoshipeng
|
6dcec88000
Merge branch 'Release2.3' into Release2.4
|
2 éve |
|
CXS
|
7668a38cf1
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
2 éve |
|
zhangjiaxin
|
63f69cd32b
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
2 éve |
|
gaoshipeng
|
4905c61cf7
rare earth classification optimize.
|
2 éve |
|
zhangjiaxin
|
2cb18bbfa5
修改报告程序无标准库名称，修改报告模板配置增加测量放大倍数
|
2 éve |
|
zhangjiaxin
|
99196d9d2b
增加选择颗粒，报告导出功能
|
2 éve |
|
gaoshipeng
|
71f174631f
edit the solution and project configuration
|
2 éve |
|
CXS
|
9680c65288
Merge branch 'dev' into cxs
|
2 éve |
