From 14c9a820cec697c024b2058ba1c63db2f5f84a5e Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期四, 18 三月 2021 09:40:51 +0800
Subject: [PATCH] 1.新增程序自动区分文件夹的上、下。
---
P066.Data/Form1.cs | 355 +++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 270 insertions(+), 85 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 2cd64fb..d0416d3 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -10,6 +10,7 @@
using System.IO;
using Bro.Common;
using Bro.Common.Util;
+using System.Configuration;
namespace P066.Data
{
@@ -24,10 +25,9 @@
{
InitializeComponent();
//ConfigHelper.Save(@"D:\P066-Data\P066XML\1.xml", runparam);
- runparam = ConfigHelper.Load<P066RunParam>(@"E:\P066.Data\P066XML\Jin_Mid.xml");
-
-
- }
+ var configuraPath = Environment.CurrentDirectory+ "\\Config\\Jin_Mid.xml";
+ runparam = ConfigHelper.Load<P066RunParam>(configuraPath);
+ }
private void btnLoadData1_Click(object sender, EventArgs e)
{
@@ -49,8 +49,26 @@
private void btnAnalyze_Click(object sender, EventArgs e)
{
- var fileinfos1 = directoryInfo1.GetFiles();
- var fileinfos2 = directoryInfo2.GetFiles();
+ var fileinfos11 = directoryInfo1.GetFiles();
+ //var fileinfos22 = directoryInfo2.GetFiles();
+ List<FileInfo> fileInfo1 = new List<FileInfo>();
+ List<FileInfo> fileInfo2 = new List<FileInfo>();
+ for (int i = 0; i < fileinfos11.Length; i++)
+ {
+ if (fileinfos11[i].Name.Contains("1_1") || fileinfos11[i].Name.Contains("2_1") || fileinfos11[i].Name.Contains("3_1") || fileinfos11[i].Name.Contains("4_1") )
+ {
+ fileInfo1.Add(fileinfos11[i]);
+ }
+ else
+ {
+ fileInfo2.Add(fileinfos11[i]);
+ }
+
+
+ }
+
+
+
var listSum = new List<ResultData>();
var JudgeListSum = new List<ResultData>();
string filename = "";
@@ -61,7 +79,7 @@
int FuNum = 0;
int GuaNum = 0;
#region//鑾峰彇鏃堕棿鎴冲苟鎺掑簭
- var allLines1 = File.ReadAllLines(fileinfos1[0].FullName, Encoding.Default);
+ var allLines1 = File.ReadAllLines(fileInfo1[0].FullName, Encoding.Default);
List<ResultData> dataList1 = new List<ResultData>();
if (allLines1.Length > 1)
{
@@ -77,12 +95,12 @@
dataListSum22.Sort();
#endregion
- for (int i = 0; i < fileinfos1.Length; i++)
+ for (int i = 0; i < fileInfo1.Count; i++)
{
- var list = CompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
- var judgeList = JudgeCompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
+ var list = CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22);
+ var judgeList = JudgeCompareFile(fileInfo1[i], fileInfo2[i],dataListSum22);
- if (fileinfos1[i].Name.Contains("鐧界偣"))
+ if (fileInfo1[i].Name.Contains("鐧界偣"))
{
WhiteI++;
list.ForEach(a => a.Lensnumber = WhiteI);
@@ -90,7 +108,7 @@
judgeList.ForEach(a => a.Lensnumber = WhiteI);
JudgeListSum.AddRange(judgeList);
}
- if (fileinfos1[i].Name.Contains("鍒櫧"))
+ if (fileInfo1[i].Name.Contains("鍒櫧"))
{
WhiteningI++;
list.ForEach(a => a.Lensnumber = WhiteningI);
@@ -102,7 +120,7 @@
string currPath = "";
#region//鍒ゆ柇鏄垵妫�鏂囦欢澶硅繕鏄妫�鏂囦欢澶�
- if (fileinfos1[i].Name.Contains("鍒濇涓"))
+ if (fileInfo1[i].Name.Contains("鍒濇涓"))
{
ChuNum++;
filenameDir = "鍒濇涓鐧界偣";
@@ -111,7 +129,7 @@
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetMidLocation(list);
}
- else if (fileinfos1[i].Name.Contains("澶嶆涓")&& fileinfos1[i].Name.Contains("鐧界偣"))
+ else if (fileInfo1[i].Name.Contains("澶嶆涓")&& fileInfo1[i].Name.Contains("鐧界偣"))
{
FuNum=FuNum+1;
filenameDir = "澶嶆涓鐧界偣";
@@ -120,16 +138,16 @@
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetMidLocation(list);
}
- else if ( fileinfos1[i].Name.Contains("澶嶆涓") &&fileinfos1[i].Name.Contains("鍒櫧"))
+ else if (fileInfo1[i].Name.Contains("澶嶆涓") && fileInfo1[i].Name.Contains("鍒櫧"))
{
GuaNum=GuaNum+1;
filenameDir = "澶嶆涓鍒櫧";
filename = "澶嶆涓鍒櫧" + GuaNum;
- judgeList = GetBkLocation(judgeList);
+ judgeList = GetWhiteLocation(judgeList);
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetBkLocation(list);
}
- else if (fileinfos1[i].Name.Contains("鍒濇鑳屾澘"))
+ else if (fileInfo1[i].Name.Contains("鍒濇鑳屾澘"))
{
ChuNum++;
filenameDir = "鍒濇鑳屾澘鐧界偣";
@@ -138,7 +156,7 @@
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetBkLocation(list);
}
- else if (fileinfos1[i].Name.Contains("澶嶆鑳屾澘") && fileinfos1[i].Name.Contains("鐧界偣"))
+ else if (fileInfo1[i].Name.Contains("澶嶆鑳屾澘") && fileInfo1[i].Name.Contains("鐧界偣"))
{
FuNum = FuNum + 1;
filenameDir = "澶嶆鑳屾澘鐧界偣";
@@ -148,7 +166,7 @@
list = GetBkLocation(list);
}
- currPath = directoryInfo1.Parent.Parent.FullName;
+ currPath = directoryInfo1.Parent.FullName;
string subPath = currPath + "/" + filenameDir + "鍚堝苟鍚�" + "/";
if (false==Directory.Exists(subPath))
{
@@ -295,8 +313,8 @@
{
list2[ii].ex = list2[ii].Height * 0.0042;
}
- var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
- list2[ii].R = distance;
+ //var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
+ //list2[ii].R = distance;
}
#endregion
for (int i = 0; i < list1.Count; i++)
@@ -310,36 +328,52 @@
{
list1[i].ex = list1[i].Height * 0.0042;
}
- var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
- list1[i].R = distance1;
+ //var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
+ //list1[i].R = distance1;
#endregion
for (int j = 0; j < list2.Count; j++)
{
+ if (list1[i].JudgmentResult != list2[j].JudgmentResult)
+ {
+ list1[i].JudgmentResult = "NG";
+ list2[j].JudgmentResult = "NG";
+
+ }
+ if (list1[i].PostTreatmentResults.Length<list2[j].PostTreatmentResults.Length)
+ {
+ list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
+ }
+ else
+ {
+ list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
+ }
var distance = GetDistance(list1[i].X, list1[i].Y, list2[j].X, list2[j].Y);
if (distance < 20)
{
- itemToRemove.Add(list2[j]);
- //if (list1[i].PostTreatmentResults=="")
- //{
- // list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
- //}
- //else
- //{
- // list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
- //}
+
+ if (list1[i].ex>list2[j].ex)
+ {
+ itemToRemove.Add(list2[j]);
+ }
+ else
+ {
+ itemToRemove.Add(list1[i]);
+ }
+
+
+
}
}
}
- for (int i = 0; i < itemToRemove.Count; i++)
- {
- list2.Remove(itemToRemove[i]);
- }
-
dataList.AddRange(list1);
dataList.AddRange(list2);
+ for (int i = 0; i < itemToRemove.Count; i++)
+ {
+ dataList.Remove(itemToRemove[i]);
+ }
}
@@ -375,6 +409,7 @@
var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
var itemToRemove1 = new List<ResultData>();
+ var itemToRemove2 = new List<ResultData>();
#region//璁＄畻琛ㄦ牸2鏈�澶у昂瀵�
for (int ii = 0; ii < list2.Count; ii++)
{
@@ -386,8 +421,8 @@
{
list2[ii].ex = list2[ii].Height * 0.0042;
}
- var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
- list2[ii].R = distance;
+ //var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
+ //list2[ii].R = distance;
}
#endregion
for (int i = 0; i < list1.Count; i++)
@@ -401,22 +436,46 @@
{
list1[i].ex = list1[i].Height * 0.0042;
}
- var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
- list1[i].R = distance1;
+ //var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
+ //list1[i].R = distance1;
#endregion
for (int j = 0; j < list2.Count; j++)
{
+ if (list1[i].JudgmentResult != list2[j].JudgmentResult)
+ {
+ list1[i].JudgmentResult = "NG";
+ list2[j].JudgmentResult = "NG";
+
+ }
+ if (list1[i].PostTreatmentResults.Length < list2[j].PostTreatmentResults.Length)
+ {
+ list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
+ }
+ else
+ {
+ list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
+ }
+
var distance = GetDistance(list1[i].X, list1[i].Y, list2[j].X, list2[j].Y);
if (distance < 20)
{
- itemToRemove1.Add(list2[j]);
- if (list1[i].JudgmentResult!=list2[j].JudgmentResult)
+
+
+ if (list1[i].ex > list2[j].ex)
{
- list1[i].JudgmentResult = "NG";
- list2[j].JudgmentResult = "NG";
+ itemToRemove2.Add(list2[j]);
}
+ else
+ {
+ itemToRemove1.Add(list1[i]);
+ }
+ //if (list1[i].JudgmentResult!=list2[j].JudgmentResult)
+ //{
+ // list1[i].JudgmentResult = "NG";
+ // list2[j].JudgmentResult = "NG";
+ //}
//if (list1[i].PostTreatmentResults == "")
//{
// list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
@@ -430,11 +489,14 @@
}
}
+ for (int i = 0; i < itemToRemove2.Count; i++)
+ {
+ list2.Remove(itemToRemove2[i]);
+ }
for (int i = 0; i < itemToRemove1.Count; i++)
{
- list2.Remove(itemToRemove1[i]);
+ list1.Remove(itemToRemove1[i]);
}
-
dataList11.AddRange(list1);
dataList22.AddRange(list2);
}
@@ -460,26 +522,13 @@
var nametemp = allLines[1].Split(',')[0];
var resulttemp = allLines[1].Split(',')[1];
string Ptr = "";
- //if (allLines[1].Split(',')[10].Length>3)
- //{
- // Ptr = allLines[1].Split(',')[10];
- //}
-
string defectType = "";
- string judgmentresult = "";
for (int i = 1; i < allLines.Length; i++)
{
var data = allLines[i].Split(',');
- //if (data.Length>10)
- //{
- // Ptr = data[10];
- //}
-
-
- //string Ptr = "";
if (data[0] == "")
{
data[0] = nametemp;
@@ -493,13 +542,12 @@
if (data[3]== "鍒櫧")
{
defectType = "鍒櫧";
- judgmentresult =data[1];
Ptr = "鍒櫧";
}
else
{
defectType = "鐧界偣";
- judgmentresult = data[1];
+ Ptr = data[10];
}
if (data[6] == "-")
@@ -541,20 +589,20 @@
}
}
data[7] = Convert.ToString(temp7);
- if (data[3]=="NG")
- {
- Ptr = data[10];
- }
- else
- {
- Ptr = "";
- }
+ //if (data[3]=="NG")
+ //{
+ // Ptr = data[10];
+ //}
+ //else
+ //{
+ // Ptr = "";
+ //}
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
ImageFileName = data[0],
- JudgmentResult = judgmentresult,
+ JudgmentResult = data[1],
Result = data[3] == "OK",
Probability = Convert.ToDouble(data[4]),
Uncertainty = Convert.ToDouble(data[5]),
@@ -588,7 +636,7 @@
var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
for (int k = 0; k < listLensnumber1.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y);
+ var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
@@ -596,6 +644,7 @@
listLensnumber1[k].angle = lenAngle;
var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
+ listLensnumber1[k].R = distance;
if (distance <= runparam.MidLens1R1)
{
listLensnumber1[k].location = "闀滃ご";
@@ -614,13 +663,14 @@
var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
for (int k = 0; k < listLensnumber2.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y);
+ var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber2[k].angle = lenAngle;
var distance = GetDistance(1050, 1050, listLensnumber2[k].X, listLensnumber2[k].Y);
+ listLensnumber2[k].R = distance;
if (distance <= runparam.MidLens2R1)
{
listLensnumber2[k].location = "闀滃ご";
@@ -638,13 +688,14 @@
var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
for (int k = 0; k < listLensnumber3.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y);
+ var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber3[k].angle = lenAngle;
var distance = GetDistance(1050, 1050, listLensnumber3[k].X, listLensnumber3[k].Y);
+ listLensnumber3[k].R = distance;
if (distance <= runparam.MidLens3R1)
{
listLensnumber3[k].location = "闀滃ご";
@@ -662,13 +713,14 @@
var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
for (int k = 0; k < listLensnumber4.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y);
+ var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber4[k].angle = lenAngle;
var distance = GetDistance(1050, 1050, listLensnumber4[k].X, listLensnumber4[k].Y);
+ listLensnumber4[k].R = distance;
if (distance <= runparam.MidLens4R1)
{
listLensnumber4[k].location = "闀滃ご";
@@ -687,6 +739,135 @@
}
return list;
}
+ //鑾峰彇涓鍒櫧瑙掑害鍜屼綅缃�
+ private List<ResultData> GetWhiteLocation(List<ResultData> list)
+ {
+ var group = list.GroupBy(a => a.TimeTip);
+ foreach (var item in group)
+ {
+ //璁＄畻闀滃ご1缂洪櫡浣嶇疆鍙婅搴�
+ var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
+ for (int k = 0; k < listLensnumber1.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1050);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber1[k].angle = lenAngle;
+
+ var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
+ listLensnumber1[k].R = distance;
+ if (distance <= runparam.MidLens1R1)
+ {
+ listLensnumber1[k].location = "闀滃ご";
+ }
+ else if (runparam.MidLens1R1 < distance && distance <= runparam.MidLens1R2)
+ {
+ listLensnumber1[k].location = "鏂滈潰";
+ }
+ else if(runparam.MidLens1R2 < distance && distance <= runparam.BkLens1R1)
+ {
+ listLensnumber1[k].location = "骞抽潰鍙鍖�";
+ }
+ else
+ {
+ listLensnumber1[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ }
+
+ }
+ //璁＄畻闀滃ご2浣嶇疆鍙婅搴�
+ var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
+ for (int k = 0; k < listLensnumber2.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1050);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber2[k].angle = lenAngle;
+ var distance = GetDistance(1050, 1050, listLensnumber2[k].X, listLensnumber2[k].Y);
+ listLensnumber2[k].R = distance;
+ if (distance <= runparam.MidLens2R1)
+ {
+ listLensnumber2[k].location = "闀滃ご";
+ }
+ else if (runparam.MidLens2R1 < distance && distance <= runparam.MidLens2R2)
+ {
+ listLensnumber2[k].location = "鏂滈潰";
+ }
+ else if (runparam.MidLens2R2 < distance && distance <= runparam.BkLens2R1)
+ {
+ listLensnumber2[k].location = "骞抽潰鍙鍖�";
+ }
+ else
+ {
+ listLensnumber2[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ }
+ }
+ //璁＄畻闀滃ご3浣嶇疆鍙婅搴�
+ var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
+ for (int k = 0; k < listLensnumber3.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1050);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber3[k].angle = lenAngle;
+ var distance = GetDistance(1050, 1050, listLensnumber3[k].X, listLensnumber3[k].Y);
+ listLensnumber3[k].R = distance;
+ if (distance <= runparam.MidLens3R1)
+ {
+ listLensnumber3[k].location = "闀滃ご";
+ }
+ else if (runparam.MidLens3R1 < distance && distance <= runparam.MidLens3R2)
+ {
+ listLensnumber3[k].location = "鏂滈潰";
+ }
+ else if (runparam.MidLens3R2 < distance && distance <= runparam.BkLens3R1)
+ {
+ listLensnumber3[k].location = "骞抽潰鍙鍖�";
+ }
+ else
+ {
+ listLensnumber3[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ }
+ }
+ //璁＄畻闀滃ご4浣嶇疆鍙婅搴�
+ var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
+ for (int k = 0; k < listLensnumber4.Count; k++)
+ {
+ var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1050);
+ if (lenAngle < 0)
+ {
+ lenAngle = 360 + lenAngle;
+ }
+ listLensnumber4[k].angle = lenAngle;
+ var distance = GetDistance(1050, 1050, listLensnumber4[k].X, listLensnumber4[k].Y);
+ listLensnumber4[k].R = distance;
+ if (distance <= runparam.MidLens4R1)
+ {
+ listLensnumber4[k].location = "闀滃ご";
+ }
+ else if (runparam.MidLens4R1 < distance && distance <= runparam.MidLens4R2)
+ {
+ listLensnumber4[k].location = "鏂滈潰";
+ }
+ else if (runparam.MidLens4R2 < distance && distance <= runparam.BkLens4R1)
+ {
+ listLensnumber4[k].location = "骞抽潰鍙鍖�";
+
+ }
+ else
+ {
+ listLensnumber4[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ }
+ }
+
+ }
+ return list;
+ }
//鑾峰彇鑳屾澘瑙掑害鍜屼綅缃�
private List<ResultData> GetBkLocation(List<ResultData> list)
{
@@ -697,14 +878,15 @@
var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
for (int k = 0; k < listLensnumber1.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y);
+ var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1350);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber1[k].angle = lenAngle;
- var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
+ var distance = GetDistance(1350, 1350, listLensnumber1[k].X, listLensnumber1[k].Y);
+ listLensnumber1[k].R = distance;
if (distance <= runparam.BkLens1R1)
{
listLensnumber1[k].location = "鍙鍖�";
@@ -720,13 +902,14 @@
var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
for (int k = 0; k < listLensnumber2.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y);
+ var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1350);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber2[k].angle = lenAngle;
- var distance = GetDistance(1050, 1050, listLensnumber2[k].X, listLensnumber2[k].Y);
+ var distance = GetDistance(1350, 1350, listLensnumber2[k].X, listLensnumber2[k].Y);
+ listLensnumber2[k].R = distance;
if (distance <= runparam.BkLens2R1)
{
listLensnumber2[k].location = "鍙鍖�";
@@ -740,13 +923,14 @@
var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
for (int k = 0; k < listLensnumber3.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y);
+ var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1350);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber3[k].angle = lenAngle;
- var distance = GetDistance(1050, 1050, listLensnumber3[k].X, listLensnumber3[k].Y);
+ var distance = GetDistance(1350, 1350, listLensnumber3[k].X, listLensnumber3[k].Y);
+ listLensnumber3[k].R = distance;
if (distance <= runparam.BkLens3R1)
{
listLensnumber3[k].location = "鍙鍖�";
@@ -761,13 +945,14 @@
var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
for (int k = 0; k < listLensnumber4.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y);
+ var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1350);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
listLensnumber4[k].angle = lenAngle;
- var distance = GetDistance(1050, 1050, listLensnumber4[k].X, listLensnumber4[k].Y);
+ var distance = GetDistance(1350, 1350, listLensnumber4[k].X, listLensnumber4[k].Y);
+ listLensnumber4[k].R = distance;
if (distance <= runparam.BkLens4R1)
{
listLensnumber4[k].location = "鍙鍖�";
@@ -838,9 +1023,9 @@
{
return Math.Sqrt(Math.Pow((x2 - x1), 2) + Math.Pow((y2 - y1), 2));
}
- private double GetAngle(double x1, double y1)
+ private double GetAngle(double x1, double y1,double size)
{
- return Math.Atan2((y1 - 1050), (x1 - 1050)) * (180 / Math.PI);
+ return Math.Atan2((y1 - size), (x1 - size)) * (180 / Math.PI);
}
}
--
Gitblit v1.8.0