Commit History

Author SHA1 Message Date
  CXS 0492d0efae Merge branch 'cxs' into Release2.3 3 years ago
  CXS 381ac97d65 颗粒列表添加硬度阶段提交2 3 years ago
  CXS 896f6b4e52 颗粒列表添加硬度阶段提交1 3 years ago
  CXS 204810be56 Merge branch 'cxs' into Release2.3 3 years ago
  CXS 62edbbf6b7 修改斜面焦距界面点击X而产生的bug 3 years ago
  CXS 3d47368604 修改 斜面焦距textbox不可编辑 3 years ago
  CXS 46571e4d62 修改报告程序大颗粒合成时图片分辨率固定的bug 3 years ago
  CXS b20291f796 Merge branch 'dev' into cxs 3 years ago
  zhangjiaxin fe430c16d8 Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev 3 years ago
  zhangjiaxin 594163abc7 报告程序谱图上增加元素L峰标识 3 years ago
  cxs 850560bdf1 diagnose the slopFocus feature and improve it. 3 years ago
  CXS 5caf3e39a8 国际化 3 years ago
  gsp 56e83d3f65 Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev 3 years ago
  gsp 637e935e11 alter the errod dilate param to 5. 3 years ago
  CXS dbc6bbe2c6 修改bug 非模态对话框无法传参 3 years ago
  CXS e25c19fcfb Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev 3 years ago
  CXS 6bce2affb0 报告重复样品名称添加 3 years ago
  gsp 9673d5531b add errodDilateparam 3 years ago
  gsp f4869f9c95 Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev 3 years ago
  gsp 46ebc13689 optimize code, add log info when set working distance and set magnification. 3 years ago
  CXS dd81085b34 添加 CorrosionExpansionCoefficient 界面 3 years ago
  gsp 63db0ffb85 Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev 3 years ago
  gsp 6e8b009708 optimize the xraypos algorithm. 3 years ago
  CXS 33e9aa4f7c 修改 SlopFocus为非模态 3 years ago
  CXS 0db06071d9 修改 SlopFocus 位置 3 years ago
  CXS aa7e3fd32c Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev 3 years ago
  CXS 02511904a0 add SlopFocus.cs 3 years ago
  gsp 90837db2d3 improve slopfocus 3 years ago
  CXS 04f7dbb1b4 Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev 3 years ago
  gsp 322e7fed40 add missing file. 3 years ago