From 9c2c297aa49bc8ca84945c713269ca225e8524b7 Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期四, 29 十月 2020 13:56:31 +0800 Subject: [PATCH] 修改穴位索引来源 --- HeightDetection.cs | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/HeightDetection.cs b/HeightDetection.cs index c6f99bc..7d4663d 100644 --- a/HeightDetection.cs +++ b/HeightDetection.cs @@ -164,10 +164,12 @@ { double compv = 0.0; Type t = opcConfig.compensationZ.GetType(); - FieldInfo fi = t.GetField(string.Format("station{0}", (CommonUtil.mainForm.PlateID + 1) % 5 + 1)); + + int slotNum = (CommonUtil.mainForm.PlateID + 1) % 5 + 1; + FieldInfo fi = t.GetField(string.Format("station{0}", slotNum)); compv = (double)fi.GetValue(opcConfig.compensationZ); - batteryHeight[0] = HeightCompensation(batteryHeight[0], compv, stationNumber); + batteryHeight[0] = HeightCompensation(batteryHeight[0], compv, slotNum); //batteryHeight[0] += compv; ////batteryHeight[1] += compv; @@ -260,7 +262,7 @@ static object _heightRawDataLock = new object(); TaskFactory _taskFactory = new TaskFactory(); - private void LogHeightRawDataAsync(DateTime dt, double rawData, double compv, double final1, double final2, int stationNum) + private void LogHeightRawDataAsync(DateTime dt, double rawData, double compv, double final1, double final2, int slotNum) { _taskFactory.StartNew(new Action(() => { @@ -280,10 +282,10 @@ { if (!isFileExisted) { - writer.WriteLine("Time,Station,Height,CompZ,Final1,Final2"); + writer.WriteLine("Time,Slot,Height,CompZ,Final1,Final2"); } - writer.WriteLine($"{dt.ToString("HH:mm:ss.fff")},{stationNum},{rawData},{compv},{final1},{final2}"); + writer.WriteLine($"{dt.ToString("HH:mm:ss.fff")},{slotNum},{rawData},{compv},{final1},{final2}"); writer.Flush(); writer.Close(); } @@ -295,7 +297,7 @@ double errorBand = Convert.ToDouble(ConfigurationManager.AppSettings["ErrorBand"]); bool isEnableRawData = Convert.ToBoolean(ConfigurationManager.AppSettings["EnableRawData"]); - private double HeightCompensation(double rawData, double compv, int stationNum) + private double HeightCompensation(double rawData, double compv, int slotNum) { double adjustValue, finalHeight, fakeValue; adjustValue = rawData + compv; @@ -312,7 +314,7 @@ if (isEnableRawData) { - LogHeightRawDataAsync(DateTime.Now, rawData, compv, finalHeight, fakeValue, stationNum); + LogHeightRawDataAsync(DateTime.Now, rawData, compv, finalHeight, fakeValue, slotNum); } return fakeValue; -- Gitblit v1.8.0