 zhangjiaxin
|
87d98e79c2
Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2
|
8 months ago |
|
zhangjiaxin
|
265509d631
修复报告修改颗粒类别bug
|
8 months ago |
 cxs
|
29860f9798
修改报告分布图全图匹配失效bug
|
8 months ago |
|
cxs
|
72aab74494
Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2
|
8 months ago |
|
cxs
|
7de41884f7
更新资源文件
|
8 months ago |
 gsp
|
f5a1650001
Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2
|
8 months ago |
|
gsp
|
5fe5c459fe
fix bugs when drawing rectangle measure area
|
8 months ago |
|
cxs
|
9c2737f551
更新配置文件
|
8 months ago |
|
gsp
|
d650fe0269
fix merge errors
|
8 months ago |
|
gsp
|
ab922dc071
add missing files
|
8 months ago |
|
gsp
|
33a85753ab
add missing files
|
8 months ago |
|
gsp
|
50d7fc244a
add missing files
|
8 months ago |
|
gsp
|
4cf0df25ec
Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2
|
8 months ago |
|
gsp
|
5387aaa12a
add missing files
|
8 months ago |
|
cxs
|
a72a683511
add CSmplMeasureInclutionForSteelMineral
|
8 months ago |
|
cxs
|
be8f932ae0
Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2
|
8 months ago |
|
cxs
|
2d23bc67a3
add OTSSplashScreen_SteelMineral
|
8 months ago |
|
gsp
|
1a15b9a172
add missing files
|
8 months ago |
|
gsp
|
f96f846735
Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2
|
8 months ago |
|
gsp
|
7de6e4604e
Merge branch 'GSP' of http://36.129.169.60:30080/gogsadmin/OTS into GSP
|
8 months ago |
|
gsp
|
a6c8f9b9cb
improve the autoBC function
|
9 months ago |
|
cxs
|
c3ba86894e
Merge branch 'OTSRelease3_2' of http://36.129.169.60:30080/gogsadmin/OTS into OTSRelease3_2
|
8 months ago |
|
cxs
|
2a7f23e57e
添加切换系统的类型相关code
|
8 months ago |
|
zhangjiaxin
|
0d8c3b5942
修复VDA19导出没显示的BUG
|
8 months ago |
|
zhangjiaxin
|
5b38660f70
修改配置文件
|
8 months ago |
|
gsp
|
ba5a5839d3
improve the autoBC function
|
9 months ago |
|
gsp
|
6734eb1e66
Merge branch 'OTSRelease3_2' into GSP
|
9 months ago |
|
gsp
|
796d2ced22
fix error of CMeasure.cs
|
9 months ago |
|
gsp
|
9cf4b49758
improve the BC autoregulate algorithm
|
9 months ago |
|
zhangjiaxin
|
8a025abf33
优化打开老版本报告程序时测量区域面积读不到的问题
|
9 months ago |
