 CXS
|
901d344b6f
add some resource codes uesd to global
|
3 rokov pred |
|
CXS
|
372534a677
add codes which is used for AutoBeamOff
|
3 rokov pred |
|
CXS
|
be6ab5ed5e
add icon named AutoBeamOff_off
|
3 rokov pred |
|
CXS
|
06e1f1fb7d
add button--rbAutoBeamOff
|
3 rokov pred |
 gsp
|
e850e5fda4
improve the SpecialGreyRange particle recognize function.
|
3 rokov pred |
|
CXS
|
5c25f204c5
Modify the codes of the encryption part
|
3 rokov pred |
|
gsp
|
a167dec305
correct the stopxrayacquisition writing fault.
|
3 rokov pred |
|
gsp
|
6dd6059dbf
complement the stopAcquisition function.
|
3 rokov pred |
|
gsp
|
97cee98740
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
3 rokov pred |
|
gsp
|
280f546eed
apply the singleton pattern to the whole hardware control.
|
3 rokov pred |
|
gsp
|
2007da4a78
Merge branch 'GSP' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into GSP
|
3 rokov pred |
|
gsp
|
f407b90a1f
add ipc support for Measure app.
|
3 rokov pred |
|
CXS
|
9c46794887
添加rbConnectHardware、rbDisconnectHardware、rbSysMgrApp
|
3 rokov pred |
|
CXS
|
e4df583486
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 rokov pred |
|
gsp
|
313cd6d18f
edit the project config of OTSRegister.csproj
|
3 rokov pred |
|
CXS
|
d79a874e1b
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 rokov pred |
 zhangjiaxin
|
ad98e73e27
ots注册
|
3 rokov pred |
|
CXS
|
007a97021e
Reclassify always valid
|
3 rokov pred |
|
gsp
|
87c0bff6b7
fix the problem of release for oxford4.2
|
3 rokov pred |
|
gsp
|
1572e09a44
fix bugs when reclassification.
|
3 rokov pred |
|
gsp
|
90eb891558
change log mode.send all the string log message to NLog console.
|
3 rokov pred |
|
gsp
|
5e73ff7ca8
change cleanliness to cleanness.
|
3 rokov pred |
|
gsp
|
dbdf44dba2
adjust the measure flow of IncA . remove some useless Resource xml files.
|
3 rokov pred |
|
gsp
|
ceec2285ce
change the opencvsharp to the original version(from dalian)
|
3 rokov pred |
|
CXS
|
b5590fbe21
修改颗粒成分总面积不准确的问题
|
3 rokov pred |
|
CXS
|
ce698be59b
修改样品台坐标系显示
|
3 rokov pred |
|
gsp
|
736cc7f4c9
Merge branch 'dev' into Release2.3
|
3 rokov pred |
|
gsp
|
56035b9619
introduce the fileWatcher component to watch the SpecialGrayConfig.xml,then we can reload it as soon as it is changed.
|
3 rokov pred |
|
CXS
|
860c165260
删除加密狗代码，添加加密狗dll
|
3 rokov pred |
|
CXS
|
d04fae1eca
Merge branch 'dev' into cxs
|
3 rokov pred |
