Commit History

Author SHA1 Message Date
  cxs 7b37c78f79 Merge branch 'cxs' into Release2.7 2 years ago
  cxs c709ff7134 样品台编辑器标样框显示 2 years ago
  cxs 9bdfe1dfae 修改 样品孔编辑器 坐标显示打开时 生成效果图 无坐标的bug 2 years ago
  cxs 0df06e5085 轴方向验证 界面完善 2 years ago
  User e5b0a7f82b fei测试完毕 2 years ago
  cxs e2035dd535 连拍功能待测试 2 years ago
  cxs 89c631d1b2 因需修改 nodelay 版本,暂时提交 2 years ago
  cxs 86ae1465c5 Merge branch 'Release2.7' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.7 2 years ago
  cxs 214ccaa9ed 修改 标准库 编辑器 新建规则,添加UsingOtherPropertyList字段 2 years ago
  cxs af1883847e sysmgr连拍提交1 2 years ago
  gsp 66d6cb1947 add systype judement while poping the menu 2 years ago
  gsp 52e2653ac8 add log when batching 2 years ago
  gsp 9436abac89 Merge branch 'GSP' of http://36.129.163.148:30080/gogsadmin/OTS into GSP 2 years ago
  gsp feee291825 fix some bugs. 2 years ago
  gsp 62d7702f2b add 1024 limit handle while doing batch process. 2 years ago
  gsp ee79d038d1 add missing files(rename cmeasureparam back to CSampleParam) 2 years ago
  gsp b3ec248f2a compile successfully 2 years ago
  gsp 44003cc53d dwell time is set to 4 2 years ago
  gsp a0e365e782 debug some compile errors.(not complete) 2 years ago
  gsp 5087dd3464 update the class structure of visual property of sample(not complete) 2 years ago
  gsp 919202d38c remove brightness and contrast reading. 2 years ago
  gsp 0944db5b92 Merge branch 'GSP' of http://36.129.163.148:30080/gogsadmin/OTS into GSP 2 years ago
  gsp 35d6cd9643 fix the problems in sysMgrApp 2 years ago
  cxs f66ae3c01d modify some conflicts 2 years ago
  gsp a1d24afad9 fix problem in report(not complete) 2 years ago
  gsp c86e8243ae add missing files. 2 years ago
  gsp 63e446a522 fix some report merging problems(not complete) 2 years ago
  gsp 60b1c4a971 Merge branch 'CleannessRelease2.5' into GSP 2 years ago
  gsp d45dfdecc8 separate the fei driver code from the oxford and bruker. 2 years ago
  gsp 82e610e7f1 add missing files 2 years ago