zty 312be6be54 Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev %!s(int64=4) %!d(string=hai) anos
..
0-OTSModel 0d0dd31bd3 Merge branch 'zty' into dev %!s(int64=4) %!d(string=hai) anos
1-OTSMeasure 0d0dd31bd3 Merge branch 'zty' into dev %!s(int64=4) %!d(string=hai) anos
2-OTSMeasureParamManage 46ebc13689 optimize code, add log info when set working distance and set magnification. %!s(int64=4) %!d(string=hai) anos
3-OTSDisplaySourceGridData 46ebc13689 optimize code, add log info when set working distance and set magnification. %!s(int64=4) %!d(string=hai) anos
4-OTSSamplespaceGraphicsPanel 227172796a Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev %!s(int64=4) %!d(string=hai) anos
5-OTSMeasureStatuImageFun 312be6be54 Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev %!s(int64=4) %!d(string=hai) anos
6-OTSDisplayTreeViewData 46ebc13689 optimize code, add log info when set working distance and set magnification. %!s(int64=4) %!d(string=hai) anos
7-OTSProgMgrInfo 9673d5531b add errodDilateparam %!s(int64=4) %!d(string=hai) anos
8-OTSSampleMeasureInfo dd95094e1a change the "sampledata" to "samplepropertyData" %!s(int64=4) %!d(string=hai) anos
9-OTSRibbon 007a97021e Reclassify always valid %!s(int64=4) %!d(string=hai) anos
OTSDataMgrFunction d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
OTSDelegateEvent d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
OTSDisplayGridData d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
OTSPeriodicTable d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
Properties e347c8c07f 合并提交 %!s(int64=4) %!d(string=hai) anos
ResourceManage 48db28d17c 添加 StopParamArea 参数 %!s(int64=4) %!d(string=hai) anos
Resources 6994d3d005 临时提交 %!s(int64=4) %!d(string=hai) anos
ServiceCenter ad767f9309 完善FEI接口代码 %!s(int64=4) %!d(string=hai) anos
About.Designer.cs 5362940878 添加About窗体 %!s(int64=4) %!d(string=hai) anos
About.cs 36211bff5e 更新一些文件 %!s(int64=4) %!d(string=hai) anos
About.resx 5362940878 添加About窗体 %!s(int64=4) %!d(string=hai) anos
App.config 59806a2536 1.更新FEI接口 %!s(int64=4) %!d(string=hai) anos
CRegistration.cs 5c25f204c5 Modify the codes of the encryption part %!s(int64=4) %!d(string=hai) anos
OTSIncAMeasureApp.csproj 0d0dd31bd3 Merge branch 'zty' into dev %!s(int64=4) %!d(string=hai) anos
OTSIncAMeasureAppForm.Designer.cs cb18e242b8 多条件联合结束功能完成 %!s(int64=4) %!d(string=hai) anos
OTSIncAMeasureAppForm.cs 637e935e11 alter the errod dilate param to 5. %!s(int64=4) %!d(string=hai) anos
OTSIncAMeasureAppForm.resx 72377e9d43 modify some names of buttons %!s(int64=4) %!d(string=hai) anos
OTSMeasureOutputNlog.Designer.cs d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
OTSMeasureOutputNlog.cs 80c8578289 improve log logic in report app %!s(int64=4) %!d(string=hai) anos
OTSMeasureOutputNlog.resx d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
Program.cs 103ed4e47f fix bugs when apply the new ipc tech %!s(int64=4) %!d(string=hai) anos
app.manifest d695f2b3e3 add ots2_0 new files after testing FEI in Beijing. %!s(int64=4) %!d(string=hai) anos
packages.config ccc041cc6b 添加报告启动系统显示于界面及sqlite升级 %!s(int64=4) %!d(string=hai) anos