From a587c3fef521ccf454716f4eeccadaca7fb77f86 Mon Sep 17 00:00:00 2001
From: jace.tang <1536884497@qq.com>
Date: 星期一, 13 六月 2022 11:33:03 +0800
Subject: [PATCH] 1.merge（上次更新内容未发全，下为补充） 2.补偿配置界面设置隐藏，无法通过界面修改 3.标准块模式默认保存图片，和图片保存开关脱钩 4.增加标准块补偿CSV数据输出 5.修改原有OPC输出事件，新的输出事件添加触发值输出。版本号升级到1.0.2022.0613
---
MainForm.cs | 11 +++--------
Properties/AssemblyInfo.cs | 4 ++--
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/MainForm.cs b/MainForm.cs
index 81c164a..14a03ac 100644
--- a/MainForm.cs
+++ b/MainForm.cs
@@ -629,18 +629,13 @@
//{
- // double preValue = 0.0;
- // double uAvg = 0.0;
- // Type t = opcConfig.standardCompensationZ.GetType();
- // FieldInfo fi = t.GetField(string.Format("station{0}", (CommonUtil.mainForm.PlateID + 1) % 5 + 1));
- // preValue = (double)fi.GetValue(opcConfig.standardCompensationZ);
- // double curCompensation = standardHeightValue - uAvg + preValue;
+
// string resultStr = $"宸ヤ綅 {plateId}锛屾娴嬮」 {u.Name}锛屽師鍏堣ˉ鍋垮�硷細{preValue}锛岃绠楄ˉ鍋垮�硷細{curCompensation}锛屾爣鍑嗗�硷細{standardHeightValue}锛屽钩鍧囧�硷細{uAvg}";
- //Trace.TraceWarning(resultStr);
+ // Trace.TraceWarning(resultStr);
- //File.AppendAllText(standardCSVFileName, $"\r\n{resultStr}\r\n");
+ // File.AppendAllText(standardCSVFileName, $"\r\n{resultStr}\r\n");
//});
//_standardResultList.Clear();
}
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 628b3bb..60115a6 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
// 鍙互鎸囧畾鎵�鏈夎繖浜涘�硷紝涔熷彲浠ヤ娇鐢ㄢ�滃唴閮ㄧ増鏈彿鈥濆拰鈥滀慨璁㈠彿鈥濈殑榛樿鍊硷紝
// 鏂规硶鏄寜濡備笅鎵�绀轰娇鐢ㄢ��*鈥�:
// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.4.1")]
-[assembly: AssemblyFileVersion("1.0.4.1")]
+[assembly: AssemblyVersion("1.0.2022.0613")]
+[assembly: AssemblyFileVersion("1.0.2022.0613")]
--
Gitblit v1.8.0