From 22fc6f995db492450c28a3982b7dccf9af97d9e9 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期五, 16 四月 2021 20:27:40 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/P066.Data
---
P066.Data/Form1.cs | 486 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 271 insertions(+), 215 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 28d592a..c5bd443 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -11,7 +11,6 @@
using Bro.Common;
using Bro.Common.Util;
using System.Configuration;
-
namespace P066.Data
{
public partial class Form1 : Form
@@ -58,23 +57,36 @@
private void btnAnalyze_Click(object sender, EventArgs e)
{
-
+ var Start = DateTime.Now;
#region 璇诲彇鏂囦欢澶逛笅鐨勬墍鏈夋枃浠讹紝骞跺皢鏂囦欢鎸夌収涓婁笅杩涜鍖哄垎;涓婅〃鏍间负fileInfo1锛屼笅琛ㄦ牸涓篺ileInfo2
- GentClassificationFile(directoryInfo1, out List<FileInfo> fileInfo1, out List<FileInfo> fileInfo2); //fileInfo1澶嶆涓婃枃浠跺す锛宖ileInfo2澶嶆涓嬫枃浠跺す
- GentClassificationFile(directoryInfo3, out List<FileInfo> fileInfo3, out List<FileInfo> fileInfo4); //fileInfo3鍒濇涓婃枃浠跺す锛宖ileInfo4鍒濇涓嬫枃浠跺す
+ List<FileInfo> fileInfo1 = new List<FileInfo>();
+ List<FileInfo> fileInfo2 = new List<FileInfo>();
+ List<FileInfo> fileInfo3 = new List<FileInfo>();
+ List<FileInfo> fileInfo4 = new List<FileInfo>();
+ Task task1 = new Task(() =>
+ {
+ if (directoryInfo1 != null)
+ {
+ GentClassificationFile(directoryInfo1, out List<FileInfo> FileInfo1, out List<FileInfo> FileInfo2); //fileInfo1澶嶆涓婃枃浠跺す锛宖ileInfo2澶嶆涓嬫枃浠跺す
+ fileInfo1 = FileInfo1;
+ fileInfo2 = FileInfo2;
+ }
+ if (directoryInfo3 != null)
+ {
+ GentClassificationFile(directoryInfo3, out List<FileInfo> FileInfo3, out List<FileInfo> FileInfo4); //fileInfo3鍒濇涓婃枃浠跺す锛宖ileInfo4鍒濇涓嬫枃浠跺す
+ fileInfo3 = FileInfo3;
+ fileInfo4 = FileInfo4;
+ }
+ });
+ task1.Start();
+ task1.Wait();
+
#endregion
- List<ResultData> DataListMerge = new List<ResultData>();
- var listSum = new List<ResultData>();
- var JudgeListSum = new List<ResultData>();
- string filename = "";
+ var ListReexaminationSum = new List<ResultData>(); //澶嶆鎶ヨ〃鏁版嵁
+ var ListPreliminarySum = new List<ResultData>(); //鍒濇鎶ヨ〃鏁版嵁
string filenameDir = "";
- //int WhiteI = 0;
- //int WhiteningI = 0;
int ScratchI = 0;
int ZoomI = 0;
- int ChuNum = 0;
- int FuNum = 0;
- int GuaNum = 0;
#region 璇诲彇涓�涓〃鏍间腑鎵�鏈夋椂闂存埑骞舵帓搴�
var dataList = GetFileData(fileInfo1[0]);
var dataGroup = dataList.GroupBy(a => a.TimeTip);
@@ -101,13 +113,13 @@
list.ForEach(a => a.Lensnumber = ScratchI);
GetMaxSize(list);
GetBkLocation(list);
- listSum.AddRange(list);
+ ListReexaminationSum.AddRange(list);
}
else if (fileinfos22[i].Name.Contains("闀�鑶滅牬鎹�"))
{
ZoomI++;
list.ForEach(a => a.Lensnumber = ZoomI);
- listSum.AddRange(list);
+ ListReexaminationSum.AddRange(list);
}
}
@@ -115,160 +127,154 @@
directoryInfo2 = null;
}
#endregion
- listSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
- for (int i = 0; i < fileInfo1.Count; i++)
+
+ var tt1 =DateTime.Now;
+ var task2= Task.Run (() =>
{
- //var list = CompareFile(fileInfo1[i], fileInfo2[i], DataTipsor);
- //if (fileInfo1[i].Name.Contains("鐧界偣"))
- //{
- // WhiteI++;
- // list.ForEach(a => a.Lensnumber = WhiteI);
- // listSum.AddRange(list);
- //}
- //else if (fileInfo1[i].Name.Contains("鍒櫧"))
- //{
- // WhiteningI++;
- // list.ForEach(a => a.Lensnumber = WhiteningI);
- // listSum.AddRange(list);
- //}
+ ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
+
- #region//鍒ゆ柇鏄垵妫�鏂囦欢澶硅繕鏄妫�鏂囦欢澶�
- string currPath = "";
- //if (fileInfo1[i].Name.Contains("鍒濇涓"))
- //{
- // ChuNum++;
- // filenameDir = "鍒濇涓鐧界偣";
- // filename = "鍒濇涓鐧界偣" + ChuNum;
- // //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- // list = GetMidLocation(list);
- //}
- //else if (fileInfo1[i].Name.Contains("澶嶆涓") && fileInfo1[i].Name.Contains("鐧界偣"))
- //{
- // FuNum = FuNum + 1;
- // filenameDir = "澶嶆涓鐧界偣";
- // filename = "澶嶆涓鐧界偣" + FuNum;
- // //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- // list = GetMidLocation(list);
- //}
- //else if (fileInfo1[i].Name.Contains("澶嶆涓") && fileInfo1[i].Name.Contains("鍒櫧"))
- //{
- // GuaNum = GuaNum + 1;
- // filenameDir = "澶嶆涓鍒櫧";
- // filename = "澶嶆涓鍒櫧" + GuaNum;
- // //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- // list = GetWhiteLocation(list);
- //}
- //else if (fileInfo1[i].Name.Contains("鍒濇鑳屾澘"))
- //{
- // ChuNum++;
- // filenameDir = "鍒濇鑳屾澘鐧界偣";
- // filename = "鍒濇鑳屾澘鐧界偣" + ChuNum;
- // //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- // list = GetBkLocation(list);
- //}
- //else if (fileInfo1[i].Name.Contains("澶嶆鑳屾澘") && fileInfo1[i].Name.Contains("鐧界偣"))
- //{
- // FuNum = FuNum + 1;
- // filenameDir = "澶嶆鑳屾澘鐧界偣";
- // filename = "澶嶆鑳屾澘鐧界偣" + FuNum;
- // //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- // //list = GetBkLocation(list);
- //}
+ });
+ var task3= Task.Run(() =>
+ {
- currPath = directoryInfo1.Parent.FullName;
- string subPath = currPath + "/" + filenameDir + "鍚堝苟鍚�" + "/";
- if (false == Directory.Exists(subPath))
+ ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
+
+
+ });
+
+ //Task.WaitAll(task2, task3);
+
+ task2.Wait();
+ var task5 = Task.Run(() =>
+ {
+
+ #region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
+ //ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
+ var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,璁惧鍚庡鐞嗙粨鏋�,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
+ var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "璁惧鍒ゆ柇缁撴灉"}.csv";
+ File.AppendAllText(file12, title12, Encoding.UTF8);
+ File.AppendAllText(file12, "\r\n");
+ foreach (var item in DataTipsor)
{
- Directory.CreateDirectory(subPath);
+ var Lens1 = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
+ writefile.WriteJR(Lens1, item, 1, file12);
+ for (int i = 2; i < 5; i++)
+ {
+ var Lens = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == i);
+ writefile.WriteJR(Lens, "", i, file12);
+ }
+
+ }
+ #endregion
+
+
+ });
+ task3.Wait();
+ var task6 = Task.Run(() =>
+ {
+
+ #region//鏍规嵁浜у搧缂栧彿杈撳嚭鎬荤己闄锋姤琛�
+ if (directoryInfo3 != null)
+ {
+ //GentClassificationFile(directoryInfo3, out List<FileInfo> fileInfo3, out List<FileInfo> fileInfo4); //fileInfo3鍒濇涓婃枃浠跺す锛宖ileInfo4鍒濇涓嬫枃浠跺す
+ //ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //鍚堝苟鍒濇涓婁笅鎶ヨ〃锛岃緭鍑哄悎骞跺悗鏁版嵁
+ List<ResultData> ListNoClearNub = new List<ResultData>(); //娓呴櫎澶辫触鏁�
+ List<ResultData> ListMayNub = new List<ResultData>(); //澶嶆澶氭鍑烘暟鏁�
+ CompareFile2(ListReexaminationSum, ListPreliminarySum, DataTipsor, out ListNoClearNub, out ListMayNub);
+ var title = $"浜у搧缂栧彿,闀滃ご缂栧彿,鎬荤己闄锋暟閲�,璁惧娓呴櫎鏁�,鏈竻闄ゆ暟,澶嶆澶氭鍑烘暟";
+ var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ File.AppendAllText(file, title, Encoding.UTF8);
+ File.AppendAllText(file, "\r\n");
+ foreach (var item in DataTipsor)
+ {
+ //鎬荤己闄锋暟
+ var ListLenSum1 = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "鐧界偣" && !a.Result);
+ var listlensum1 = ListLenSum1.Count;
+ //鏈竻闄ゆ暟
+ var ListLenNoClearSum1 = ListNoClearNub.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "鐧界偣" && !a.Result);
+ var listlennoclearsum1 = ListLenNoClearSum1.Count;
+ //璁惧娓呴櫎鏁�
+ var listlenclearsum1 = listlensum1 - listlennoclearsum1;
+ //澶嶆澶氭鍑烘暟
+ var ListLenMaySum1 = ListMayNub.FindAll(a => a.TimeTip == item && a.Lensnumber == 1 && a.DefectType == "鐧界偣" && !a.Result);
+ var listlenmaysum1 = ListLenMaySum1.Count;
+
+ var content1 = $"{item},{1},{listlensum1},{listlenclearsum1},{listlennoclearsum1},{listlenmaysum1}";
+ File.AppendAllText(file, content1, Encoding.UTF8);
+ File.AppendAllText(file, "\r\n");
+
+ for (int i = 2; i < 5; i++)
+ {
+ //鎬荤己闄锋暟
+ var ListLenSum = ListPreliminarySum.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlensum = ListLenSum.Count;
+ //鏈竻闄ゆ暟
+ var ListLenNoClearSum = ListNoClearNub.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlennoclearsum = ListLenNoClearSum.Count;
+ //璁惧娓呴櫎鏁�
+ var listlenclearsum = listlensum - listlennoclearsum;
+ //澶嶆澶氭鍑烘暟
+ var ListLenMaySum = ListMayNub.FindAll(a => a.TimeTip == item && a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlenmaysum = ListLenMaySum.Count;
+ var content = $"{""},{i},{listlensum},{listlenclearsum},{listlennoclearsum},{listlenmaysum}";
+ File.AppendAllText(file, content, Encoding.UTF8);
+ File.AppendAllText(file, "\r\n");
+ }
+ }
+ var title1 = $"闀滃ご缂栧彿,鎬荤己闄锋暟閲�,璁惧娓呴櫎鏁�,娓呴櫎鐜�";
+ var file1 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ File.AppendAllText(file1, title1, Encoding.UTF8);
+ File.AppendAllText(file1, "\r\n");
+ for (int i =1; i < 5; i++)
+ {
+ //鍒濇缂洪櫡鏁�
+ var ListLenSum1 = ListPreliminarySum.FindAll(a => a.Lensnumber ==i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlensum1 = ListLenSum1.Count;
+ //澶嶆澶氭鍑烘暟
+ var ListLenMaySum1 = ListMayNub.FindAll(a=> a.Lensnumber ==i&& a.DefectType == "鐧界偣" && !a.Result);
+ var listlenmaysum1 = ListLenMaySum1.Count;
+ //鎬荤己闄锋暟
+ var defectSum = listlenmaysum1 + listlensum1;
+ //闄ゅ皹鏁�
+ var ListLenNoClearSum1 = ListNoClearNub.FindAll(a => a.Lensnumber == i && a.DefectType == "鐧界偣" && !a.Result);
+ var listlennoclearsum1 = ListLenNoClearSum1.Count;
+ var defectClearSum = listlensum1 - listlennoclearsum1;
+
+
+ var content1 = $"{i},{defectSum},{defectClearSum},{(double)(defectSum / defectSum)}";
+ File.AppendAllText(file1, content1, Encoding.UTF8);
+ File.AppendAllText(file1, "\r\n");
+ }
+
+
+ directoryInfo3 = null;
}
- #endregion
+ #endregion
+ });
- //var title1 = $"鏃堕棿鎴�,鏂囦欢鍚�,鍒ゆ柇,鍙兘鎬�,涓嶇‘瀹氭��,楂�,瀹�,X,Y,鏈�澶у昂瀵�,浣嶇疆,R,瑙掑害";
- //var file1 = $"{subPath}\\{filename}.csv";
- //File.AppendAllText(file1, title1, Encoding.UTF8);
- //File.AppendAllText(file1, "\r\n");
-
-
- //foreach (var item in DataTipsor)
- //{
- // var list11 = list.FindAll(a => a.TimeTip == item && !a.Result);
- // for (int q = 0; q < list11.Count; q++)
- // {
- // string result = list11[q].Result ? "OK" : "NG";
-
- // var content = $"{list11[q].TimeTip},{list11[q].ImageFileName},{result},{list11[q].Probability},{list11[q].Uncertainty},{list11[q].Height},{list11[q].Width},{list11[q].X},{list11[q].Y},{list11[q].ex},{list11[q].location},{ Convert.ToInt32(list11[q].R)},{ Convert.ToInt32(list11[q].angle)}";
-
- // File.AppendAllText(file1, content, Encoding.UTF8);
- // File.AppendAllText(file1, "\r\n");
- // }
-
-
- //}
- }
-
-
- #region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
- var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,璁惧鍚庡鐞嗙粨鏋�,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
- var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "璁惧鍒ゆ柇缁撴灉"}.csv";
- File.AppendAllText(file12, title12, Encoding.UTF8);
- File.AppendAllText(file12, "\r\n");
- foreach (var item in DataTipsor)
- {
- var Lens1 = listSum.FindAll(a => a.TimeTip == item&&a.Lensnumber==1);
- writefile.WriteJR(Lens1,item,1,file12);
- var Lens2 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
- writefile.WriteJR(Lens2,"",2,file12);
- var Lens3 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
- writefile.WriteJR(Lens3,"",3,file12);
- var Lens4 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 4);
- writefile.WriteJR(Lens4,"",4,file12);
-
- }
- #endregion
+ Task.WaitAll(new Task[]{ task5, task6});
- #region//鏍规嵁浜у搧缂栧彿杈撳嚭鎬荤己闄锋姤琛�
- var title = $"浜у搧缂栧彿,闀滃ご缂栧彿,鎬荤己闄锋暟閲�";
- var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
- File.AppendAllText(file, title, Encoding.UTF8);
- File.AppendAllText(file, "\r\n");
- foreach (var item in DataTipsor)
- {
- var listLensnumber1 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
- var listLensnumberCount1 = listLensnumber1.Count;
- var listLensnumber2 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
- var listLensnumberCount2 = listLensnumber2.Count;
- var listLensnumber3 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
- var listLensnumberCount3 = listLensnumber3.Count;
- var listLensnumber4 = listSum.FindAll(a => a.TimeTip == item&& a.Lensnumber == 4);
- var listLensnumberCount4 = listLensnumber4.Count;
- //绗竴琛�
- var content1 = $"{item},{1},{listLensnumberCount1}";
- File.AppendAllText(file, content1, Encoding.UTF8);
- File.AppendAllText(file, "\r\n");
- //绗簩琛�
- var content2 = $"{""},{2},{listLensnumberCount2}";
- File.AppendAllText(file, content2, Encoding.UTF8);
- File.AppendAllText(file, "\r\n");
- //绗笁琛�
- var content3 = $"{""},{3},{listLensnumberCount3}";
- File.AppendAllText(file, content3, Encoding.UTF8);
- File.AppendAllText(file, "\r\n");
- //绗洓琛�
- var content4 = $"{""},{4},{listLensnumberCount4}";
- File.AppendAllText(file, content4, Encoding.UTF8);
- File.AppendAllText(file, "\r\n");
- }
- #endregion
+ var tt2 =DateTime.Now;
+ var sumtt = tt2 - tt1;
+
+
+
+
+
+ var End = DateTime.Now;
+ var Time = Start - End;
+ MessageBox.Show("澶勭悊瀹屾瘯锛岀敤鏃�"+Convert.ToString(Time));
}
#region 涓や釜琛ㄦ牸杩涜姣旇緝,濡傛灉涓や釜琛ㄦ牸涓湁璁惧鍒ゆ柇鏍囧噯涓嶇粺涓�锛屽皢璇ョ偣鍙樹负NG锛屽垹闄や袱涓〃鏍间腑NG鐐圭浉杩戠殑鏈�灏忓昂瀵哥偣.
@@ -337,29 +343,29 @@
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 ListLenSum1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
+ for (int k = 0; k < ListLenSum1.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1050);
+ var lenAngle = GetAngle(ListLenSum1[k].X, ListLenSum1[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
- listLensnumber1[k].angle = lenAngle;
+ ListLenSum1[k].angle = lenAngle;
- var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
- listLensnumber1[k].R = distance;
+ var distance = GetDistance(1050, 1050, ListLenSum1[k].X, ListLenSum1[k].Y);
+ ListLenSum1[k].R = distance;
if (distance <= runparam.MidLens1R1)
{
- listLensnumber1[k].location = "闀滃ご";
+ ListLenSum1[k].location = "闀滃ご";
}
else if (runparam.MidLens1R1 < distance && distance <= runparam.MidLens1R2)
{
- listLensnumber1[k].location = "鏂滈潰";
+ ListLenSum1[k].location = "鏂滈潰";
}
else
{
- listLensnumber1[k].location = "骞抽潰";
+ ListLenSum1[k].location = "骞抽潰";
}
}
@@ -451,33 +457,33 @@
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 ListLenSum1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
+ for (int k = 0; k < ListLenSum1.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1050);
+ var lenAngle = GetAngle(ListLenSum1[k].X, ListLenSum1[k].Y,1050);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
- listLensnumber1[k].angle = lenAngle;
+ ListLenSum1[k].angle = lenAngle;
- var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
- listLensnumber1[k].R = distance;
+ var distance = GetDistance(1050, 1050, ListLenSum1[k].X, ListLenSum1[k].Y);
+ ListLenSum1[k].R = distance;
if (distance <= runparam.MidLens1R1)
{
- listLensnumber1[k].location = "闀滃ご";
+ ListLenSum1[k].location = "闀滃ご";
}
else if (runparam.MidLens1R1 < distance && distance <= runparam.MidLens1R2)
{
- listLensnumber1[k].location = "鏂滈潰";
+ ListLenSum1[k].location = "鏂滈潰";
}
else if(runparam.MidLens1R2 < distance && distance <= runparam.BkLens1R1)
{
- listLensnumber1[k].location = "骞抽潰鍙鍖�";
+ ListLenSum1[k].location = "骞抽潰鍙鍖�";
}
else
{
- listLensnumber1[k].location = "骞抽潰闈炲彲瑙嗗尯";
+ ListLenSum1[k].location = "骞抽潰闈炲彲瑙嗗尯";
}
}
@@ -582,26 +588,26 @@
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 ListLenSum1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
+ for (int k = 0; k < ListLenSum1.Count; k++)
{
- var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1350);
+ var lenAngle = GetAngle(ListLenSum1[k].X, ListLenSum1[k].Y,1350);
if (lenAngle < 0)
{
lenAngle = 360 + lenAngle;
}
- listLensnumber1[k].angle = lenAngle;
+ ListLenSum1[k].angle = lenAngle;
- var distance = GetDistance(1350, 1350, listLensnumber1[k].X, listLensnumber1[k].Y);
- listLensnumber1[k].R = distance;
+ var distance = GetDistance(1350, 1350, ListLenSum1[k].X, ListLenSum1[k].Y);
+ ListLenSum1[k].R = distance;
if (distance <= runparam.BkLens1R1)
{
- listLensnumber1[k].location = "鍙鍖�";
+ ListLenSum1[k].location = "鍙鍖�";
}
else
{
- listLensnumber1[k].location = "闈炲彲瑙嗗尯";
+ ListLenSum1[k].location = "闈炲彲瑙嗗尯";
}
}
@@ -760,50 +766,100 @@
#region 鑾峰彇鐧界偣銆佸埉鐧芥暟鎹苟鎸夐暅澶磋緭鍑�
private List<ResultData> GetClassificationLens(List<FileInfo> fileInfo1, List<FileInfo> fileInfo2, List<string> DataTipsor)
{
- List<ResultData> listsum = new List<ResultData>();
+ List<ResultData> ListReexaminationSum = new List<ResultData>();
int WhiteI = 0;
int WhiteningI = 0;
+ List<Task> listTask = new List<Task>();
for (int i = 0; i < fileInfo1.Count; i++)
{
- var list = CompareFile(fileInfo1[i], fileInfo2[i], DataTipsor);
- if (fileInfo1[i].Name.Contains("鐧界偣"))
- {
- WhiteI++;
- list.ForEach(a => a.Lensnumber = WhiteI);
- listsum.AddRange(list);
- }
- else if (fileInfo1[i].Name.Contains("鍒櫧"))
- {
- WhiteningI++;
- list.ForEach(a => a.Lensnumber = WhiteningI);
- listsum.AddRange(list);
+ int index = i;
+ Task task = new Task(() => {
+ var list = CompareFile(fileInfo1[index], fileInfo2[index], DataTipsor);
+ if (fileInfo1[index].Name.Contains("鐧界偣"))
+ {
+ WhiteI++;
+ list.ForEach(a => a.Lensnumber = WhiteI);
+ ListReexaminationSum.AddRange(list);
+ }
+ else if (fileInfo1[index].Name.Contains("鍒櫧"))
+ {
+ WhiteningI++;
+ list.ForEach(a => a.Lensnumber = WhiteningI);
+ ListReexaminationSum.AddRange(list);
- }
- if (fileInfo1[i].Name.Contains("鍒濇涓"))
- {
- list = GetMidLocation(list);
- }
- else if (fileInfo1[i].Name.Contains("澶嶆涓") && fileInfo1[i].Name.Contains("鐧界偣"))
- {
- list = GetMidLocation(list);
- }
- else if (fileInfo1[i].Name.Contains("澶嶆涓") && fileInfo1[i].Name.Contains("鍒櫧"))
- {
- list = GetWhiteLocation(list);
- }
- else if (fileInfo1[i].Name.Contains("鍒濇鑳屾澘"))
- {
- //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- list = GetBkLocation(list);
- }
- else if (fileInfo1[i].Name.Contains("澶嶆鑳屾澘") && fileInfo1[i].Name.Contains("鐧界偣"))
- {
- list = GetBkLocation(list);
- }
+ }
+ if (fileInfo1[index].Name.Contains("鍒濇涓"))
+ {
+ list = GetMidLocation(list);
+ }
+ else if (fileInfo1[index].Name.Contains("澶嶆涓") && fileInfo1[index].Name.Contains("鐧界偣"))
+ {
+ list = GetMidLocation(list);
+ }
+ else if (fileInfo1[index].Name.Contains("澶嶆涓") && fileInfo1[index].Name.Contains("鍒櫧"))
+ {
+ list = GetWhiteLocation(list);
+ }
+ else if (fileInfo1[index].Name.Contains("鍒濇鑳屾澘"))
+ {
+ //缁欓暅澶村尯鍒嗕綅缃強瑙掑害
+ list = GetBkLocation(list);
+ }
+ else if (fileInfo1[index].Name.Contains("澶嶆鑳屾澘") && fileInfo1[index].Name.Contains("鐧界偣"))
+ {
+ list = GetBkLocation(list);
+ }
+ });
+ task.Start();
+ listTask.Add(task);
+
}
- return listsum;
+ Task.WaitAll(listTask.ToArray());
+ return ListReexaminationSum;
}
#endregion
+
+ #region //缁熻璁惧鏈竻闄ゆ暟銆佸妫�澶氭鍑烘暟
+ private void CompareFile2(List<ResultData> ListReexaminationSum, List<ResultData> ListPreliminarySum,List<string> DataTipsor, out List<ResultData> ListNoClearNub, out List<ResultData> ListMayNub) //ListReexaminationSum鏄妫�鏁版嵁锛孡istPreliminarySum鏄垵妫�鏁版嵁
+ {
+ var listNCN = new List<ResultData>();
+ //var listmany = new List<ResultData>();
+ var itemToRemove = new List<ResultData>();
+ for (int i = 0; i < DataTipsor.Count; i++)
+ {
+ for (int j = 1; j < 5; j++)
+ {
+ var ListReexaminationLens = ListReexaminationSum.FindAll(a => a.TimeTip == DataTipsor[i] && a.Lensnumber == j&&a.DefectType=="鐧界偣"&&!a.Result);
+ var ListPreliminaryLens = ListPreliminarySum.FindAll(a => a.TimeTip == DataTipsor[i] && a.Lensnumber == j && a.DefectType == "鐧界偣" && !a.Result);
+
+
+ for (int k = 0; k < ListPreliminaryLens.Count; k++)
+ {
+ for (int L = 0; L < ListReexaminationLens.Count; L++)
+ {
+ var distance = GetDistance(ListPreliminaryLens[k].X, ListPreliminaryLens[k].Y, ListReexaminationLens[L].X, ListReexaminationLens[L].Y);
+ if (distance<20)
+ {
+ listNCN.Add(ListReexaminationLens[L]); //鏈竻闄ゆ暟
+ }
+
+ }
+ }
+
+ }
+
+ }
+ var listmany = ListReexaminationSum.FindAll(a => a.DefectType == "鐧界偣" && !a.Result);
+ for (int M = 0; M < listNCN.Count; M++)
+ {
+ listmany.Remove(listNCN[M]);
+ }
+ ListNoClearNub = listNCN;
+ ListMayNub = listmany;
+ }
+
+ #endregion
+
private List <ResultData> GetFileData(FileInfo fileInfos)
{
var allLines = File.ReadAllLines(fileInfos.FullName, Encoding.Default);
--
Gitblit v1.8.0