From 1c4426810c71eead57084be8a18ade8d314dd8c4 Mon Sep 17 00:00:00 2001
From: patrick <patrick.xu@broconcentric.com>
Date: 星期二, 10 十二月 2019 14:24:31 +0800
Subject: [PATCH] 1. 重构项目
---
src/A032.Config/ConfigFrm.cs | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/A032.Config/ConfigFrm.cs b/src/A032.Config/ConfigFrm.cs
index 388f59d..f83c982 100644
--- a/src/A032.Config/ConfigFrm.cs
+++ b/src/A032.Config/ConfigFrm.cs
@@ -227,7 +227,7 @@
private void OnProcessLog(DateTime dt, string prefix, string msg)
{
- RecordMsg(dt.ToString("yyyyMMdd HH:mm:ss") + "\r\n" + prefix + "\r\n" + msg + "\r\n");
+ RecordMsg(dt.ToString("yyyyMMdd HH:mm:ss.fff") + "\r\n" + prefix + "\r\n" + (string.IsNullOrWhiteSpace(msg) ? "" : (msg + "\r\n")));
}
private void btnStopProcess_Click(object sender, EventArgs e)
@@ -267,21 +267,21 @@
private void cboCalibrationMethod_SelectedIndexChanged(object sender, EventArgs e)
{
- //if (cboCalibrationMethod.SelectedIndex >= 0)
- //{
- // string methodCode = cboCalibrationMethod.SelectedValue.ToString();
+ if (cboCalibrationMethod.SelectedIndex >= 0)
+ {
+ string methodCode = cboCalibrationMethod.SelectedValue.ToString();
- // _calibrationMethod = _calibrationMethodDict[_calibrationMethodDict.Keys.FirstOrDefault(u => u.MethodCode == methodCode)];
+ _calibrationMethod = _calibrationMethodDict[_calibrationMethodDict.Keys.FirstOrDefault(u => u.MethodCode == methodCode)];
- // if (Process.StationConfig.ProcessOpConfigDict.Keys.Contains(methodCode))
- // {
- // propCalibrationConfig.SelectedObject = Process.StationConfig.ProcessOpConfigDict[methodCode];
- // }
- // else
- // {
- // MessageBox.Show(@"Config of " + methodCode + @" is not found");
- // }
- //}
+ if (Process.StationConfig.ProcessOpConfigDict.Keys.Contains(methodCode))
+ {
+ propCalibrationConfig.SelectedObject = Process.StationConfig.ProcessOpConfigDict[methodCode];
+ }
+ else
+ {
+ MessageBox.Show(@"Config of " + methodCode + @" is not found");
+ }
+ }
}
private void btnStartCalibration_Click(object sender, EventArgs e)
@@ -320,7 +320,7 @@
List<IDevice> _deviceList = new List<IDevice>();
private void InitialDevices()
{
- _deviceList = (Process as ProcessControl).GetDeviceList();
+ _deviceList = (Process as ProcessControl).DeviceList;
List<ISimpleDevice> list = _deviceList.Select(u => u as ISimpleDevice).ToList();
UIHelper.SetCombo(cboCalibDevices, list, "Name", "Id");
--
Gitblit v1.8.0