 CXS
|
8ca5087ee0
添加已分析颗粒和其它颗粒列表
|
3 lat temu |
|
CXS
|
bab90d6978
合并解决冲突
|
3 lat temu |
|
CXS
|
bffa59ea53
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
3 lat temu |
 zty
|
9269eac592
修改报告Model位置
|
3 lat temu |
 zhangjiaxin
|
bc43d2bc6c
报告程序从数据中删除选中颗粒（未完成临时）
|
3 lat temu |
|
CXS
|
80acb4fb15
修改bug及添加极值分析法按钮
|
3 lat temu |
 gsp
|
f407b90a1f
add ipc support for Measure app.
|
3 lat temu |
|
gsp
|
80c8578289
improve log logic in report app
|
3 lat temu |
|
CXS
|
46870e4230
删除报告中菜单项复制和全部复制项
|
3 lat temu |
|
CXS
|
7b6ca320e6
change format of report
|
3 lat temu |
|
CXS
|
d856f007d2
删除元素成分图
|
3 lat temu |
|
CXS
|
8b33c89708
1.删除中英文配置文件
|
3 lat temu |
|
gsp
|
6bd835c00c
binding the Nlog window to a window which is in our application.
|
3 lat temu |
|
zhangjiaxin
|
3a6d30faf0
修改报告程序选择测量结果文件时选择取消报错的问题
|
3 lat temu |
|
CXS
|
1ce3798a1f
报告程序添加帮助界面说明
|
3 lat temu |
|
zhangjiaxin
|
698fc029fb
测量程序打开报告程序，分布图没有加载grid表需要切换，因合并代码是发生的已解决
|
3 lat temu |
|
zhangjiaxin
|
2789113e29
Merge branch 'dev' into ZJX
|
3 lat temu |
|
zhangjiaxin
|
f867601db5
临时提交
|
3 lat temu |
|
gsp
|
06bea41160
add read simimage.tiff function.
|
3 lat temu |
|
gsp
|
b40e6fbabd
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 lat temu |
|
gsp
|
3c759ce2ce
restore the DATASOURCE_TYPE chosen function.
|
3 lat temu |
|
zhangjiaxin
|
035ffae7a0
处理测量程序打开报告程序时报错的问题
|
3 lat temu |
|
zhangjiaxin
|
965b71f7b2
Merge branch 'dev' into ZJX
|
3 lat temu |
|
gsp
|
1669c3bcc4
add filter particle function .
|
3 lat temu |
|
zhangjiaxin
|
24aa5b44c9
报告程序目测没有遗漏的中文（OTS中英文）
|
3 lat temu |
|
zhangjiaxin
|
dd4a347a34
更改报告程序中英文
|
3 lat temu |
|
CXS
|
a0b45ab920
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 lat temu |
|
zhangjiaxin
|
e4a1fd920a
Merge branch 'dev' into ZJX
|
3 lat temu |
|
gsp
|
2cab12ce21
refactor on the sourcegrid display algorithm.
|
3 lat temu |
|
CXS
|
949b463943
otsmgrinfo 英文配置
|
3 lat temu |
