 CXS
|
b5590fbe21
修改颗粒成分总面积不准确的问题
|
3 anni fa |
|
CXS
|
ce698be59b
修改样品台坐标系显示
|
3 anni fa |
 gsp
|
736cc7f4c9
Merge branch 'dev' into Release2.3
|
3 anni fa |
|
gsp
|
56035b9619
introduce the fileWatcher component to watch the SpecialGrayConfig.xml,then we can reload it as soon as it is changed.
|
3 anni fa |
|
CXS
|
860c165260
删除加密狗代码，添加加密狗dll
|
3 anni fa |
|
CXS
|
d04fae1eca
Merge branch 'dev' into cxs
|
3 anni fa |
|
CXS
|
ec46db165d
处理bug 测量界面窗体的删除按钮逻辑错误
|
3 anni fa |
|
gsp
|
3f4d57de0b
optimizing the OpenCV connectivitie method to process the bse image.
|
3 anni fa |
|
CXS
|
63b901913c
Merge branch 'Release2.3' into cxs
|
3 anni fa |
|
gsp
|
532fdda1a7
Merge branch 'Release2.3' into dev
|
3 anni fa |
|
CXS
|
58ce3201c3
加密狗 重新分类部分修改
|
3 anni fa |
|
gsp
|
d7d72fbfd6
add getspecialgray particles function.
|
3 anni fa |
|
CXS
|
c2c0b1ef66
三点法画圆代码尝试理解
|
3 anni fa |
|
CXS
|
654b6537bf
Fix bug - The measurement program loads the saved measurement file system interface showing the corresponding startup mode
|
3 anni fa |
 shiyanshi
|
e8d5beb5c4
using short connection mode instead of long connection mode.
|
3 anni fa |
|
gsp
|
460699b0ae
close sem connect before we open the report app.
|
3 anni fa |
|
shiyanshi
|
9021c0c942
Merge branch 'release2.1' into dev
|
3 anni fa |
|
gsp
|
da32102403
doesn't DisConnect the sem after reading or writing data to bruker device untill exit the whole application.
|
3 anni fa |
|
CXS
|
7030e2c03f
修改 清洁度 小颗粒分类 中未识别类型没有写入的bug
|
3 anni fa |
|
CXS
|
5362940878
添加About窗体
|
3 anni fa |
 zhangjiaxin
|
2ac3b67dfd
Merge branch 'ZJX' into dev
|
3 anni fa |
|
CXS
|
8877cb8f2b
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 anni fa |
|
gsp
|
9a3306c444
optimize the control flow
|
3 anni fa |
|
CXS
|
5d437cb8a8
更新 启动 模式 显示 名称
|
3 anni fa |
|
CXS
|
fa2f507b2a
修改标准库启动查找路径以匹配多选的启动模式！
|
3 anni fa |
|
zhangjiaxin
|
617c4be0e6
Merge branch 'TestForSelpa' into ZJX
|
3 anni fa |
|
CXS
|
99e3209b0d
测量程序添加启动系统
|
3 anni fa |
|
zhangjiaxin
|
1488257032
测量程序保存和另存时，选择取消操作，LOG中爆红的问题
|
3 anni fa |
|
gsp
|
6a28276206
add cleanliness system support.
|
3 anni fa |
|
gsp
|
782ac7795b
optimize the DefaultParam and StageParam loading method code.
|
3 anni fa |
