From 6cb3ad78c7a43f76e29d784bedb87dcc790e3b1f Mon Sep 17 00:00:00 2001
From: Jack.Peng <jack.peng@broconcentric.com>
Date: 星期日, 14 三月 2021 22:24:29 +0800
Subject: [PATCH] 1.新增后处理结果输出到报表中。
---
P066.Data/Form1.cs | 363 ++++++++++++++++-----------------------------------
1 files changed, 117 insertions(+), 246 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 1f313bd..c1c8143 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -46,12 +46,33 @@
var listSum = new List<ResultData>();
var JudgeListSum = new List<ResultData>();
string filename = "";
+ string filenameDir = "";
int WhiteI = 0;
int WhiteningI = 0;
+ int ChuNum = 0;
+ int FuNum = 0;
+ int GuaNum = 0;
+ #region//鑾峰彇鏃堕棿鎴冲苟鎺掑簭
+ var allLines1 = File.ReadAllLines(fileinfos1[0].FullName, Encoding.Default);
+ List<ResultData> dataList1 = new List<ResultData>();
+ if (allLines1.Length > 1)
+ {
+ dataList1 = GetData(allLines1);
+ }
+ var dataGroup111 = dataList1.GroupBy(a => a.TimeTip);
+ var dataListSum22 = new List<string>();
+ foreach (var item in dataGroup111)
+ {
+ dataListSum22.Add(item.Key);
+ }
+ dataListSum22 = dataListSum22.Distinct().ToList();
+ dataListSum22.Sort();
+ #endregion
+
for (int i = 0; i < fileinfos1.Length; i++)
{
- var list = CompareFile(fileinfos1[i], fileinfos2[i]);
- var judgeList = JudgeCompareFile(fileinfos1[i], fileinfos2[i]);
+ var list = CompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
+ var judgeList = JudgeCompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
if (fileinfos1[i].Name.Contains("鐧界偣"))
{
@@ -77,43 +98,35 @@
#region//鍒ゆ柇鏄垵妫�鏂囦欢澶硅繕鏄妫�鏂囦欢澶�
if (fileinfos1[i].Name.Contains("鍒濇"))
{
- filename = "鍒濇";
+ ChuNum++;
+ filenameDir = "鍒濇";
+ filename = "鍒濇"+ ChuNum;
}
- if (fileinfos1[i].Name.Contains("澶嶆"))
+ else if (fileinfos1[i].Name.Contains("澶嶆")&& fileinfos1[i].Name.Contains("鐧界偣"))
{
- filename = "澶嶆";
+ FuNum=FuNum+1;
+ filenameDir = "澶嶆";
+ filename = "澶嶆" + FuNum;
}
- if (fileinfos1[i].Name.Contains("鍒櫧"))
- {
- filename = "鍒櫧";
- }
+ else if ( fileinfos1[i].Name.Contains("澶嶆")&&fileinfos1[i].Name.Contains("鍒櫧"))
+ {
+ GuaNum=GuaNum+1;
+ filenameDir = "鍒櫧";
+ filename = "鍒櫧" + GuaNum;
+ }
+
currPath = directoryInfo1.Parent.Parent.FullName;
- string subPath = currPath + "/" + filename + "鍚堝苟鍚�" + "/";
+ string subPath = currPath + "/" + filenameDir + "鍚堝苟鍚�" + "/";
if (false==Directory.Exists(subPath))
{
Directory.CreateDirectory(subPath);
}
#endregion
- #region//娴嬭瘯杈撳嚭璁惧鍒ゆ柇缁撴灉
- //var title12 = $"鏃堕棿鎴�,璁惧鍒ゆ柇缁撴灉";
- //var file12 = $"{directoryInfo1.Parent.FullName}\\{filename + (i + 111)}.csv";
- //File.AppendAllText(file12, title12, Encoding.UTF8);
- //File.AppendAllText(file12, "\r\n");
- //foreach (var item in JudgeListSum)
- //{
-
- // var conrent12 = $"{item.TimeTip},{item.JudgmentResult}";
- // File.AppendAllText(file12, conrent12, Encoding.UTF8);
- // File.AppendAllText(file12, "\r\n");
- //}
-
- #endregion
-
- var title1 = $"鏃堕棿鎴�,鏂囦欢鍚�,鍒ゆ柇,鍙兘鎬�,涓嶇‘瀹氭��,楂�,瀹�,X,Y,鏈�澶у昂瀵�,浣嶇疆,R,瑙掑害,缂洪櫡绫诲瀷";
- var file1 = $"{subPath}\\{filename + (i+1)}.csv";
+ var title1 = $"鏃堕棿鎴�,鏂囦欢鍚�,鍒ゆ柇,鍙兘鎬�,涓嶇‘瀹氭��,楂�,瀹�,X,Y,鏈�澶у昂瀵�,浣嶇疆,R,瑙掑害";
+ var file1 = $"{subPath}\\{filename}.csv";
File.AppendAllText(file1, title1, Encoding.UTF8);
File.AppendAllText(file1, "\r\n");
@@ -133,35 +146,31 @@
// File.AppendAllText(file2, "\r\n");
//}
#endregion
- var list11 = list.FindAll(a => !a.Result);
- foreach (var item in list11)
+
+ foreach (var item in dataListSum22)
{
- string result = item.Result ? "OK" : "NG";
+ 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 = $"{item.TimeTip},{item.ImageFileName},{result},{item.Probability},{item.Uncertainty},{item.Height},{item.Width},{item.X},{item.Y},{item.ex},{item.location},{ Convert.ToInt32(item.R)},{ Convert.ToInt32(item.angle)},{item.DefectType}";
+ 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");
+ File.AppendAllText(file1, content, Encoding.UTF8);
+ File.AppendAllText(file1, "\r\n");
+ }
+
+
}
}
- var dataGroup1 = listSum.GroupBy(a => a.TimeTip);
- var dataListSum = new List<string>();
-
- foreach (var item in dataGroup1)
- {
- dataListSum.Add(item.Key);
- }
- dataListSum = dataListSum.Distinct().ToList();
- dataListSum.Sort();
- var dataList = new List<ResultData>();
#region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
- var title12 = $"鏃堕棿鎴�,鐩告満搴忓彿,璁惧鍒ゆ柇缁撴灉,缂洪櫡绫诲瀷,鏈�澶у昂瀵�,浣嶇疆,X,Y,R,瑙掑害";
- var file12 = $"{directoryInfo1.Parent.FullName}\\{filename+"璁惧鍒ゆ柇缁撴灉"}.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 dataListSum)
+ foreach (var item in dataListSum22)
{
var Lens1 = JudgeListSum.FindAll(a => a.TimeTip == item&&a.Lensnumber==1);
WriteJR(Lens1,item,1,file12);
@@ -180,22 +189,21 @@
#region//鏍规嵁浜у搧缂栧彿杈撳嚭鎬荤己闄锋姤琛�
var title = $"浜у搧缂栧彿,闀滃ご缂栧彿,鎬荤己闄锋暟閲�";
- var file = $"{directoryInfo1.Parent.FullName}\\{filename+ "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
+ var file = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "缂洪櫡鎬绘暟鎶ヨ〃"}.csv";
File.AppendAllText(file, title, Encoding.UTF8);
File.AppendAllText(file, "\r\n");
- var listSumGroup = listSum.GroupBy(a => a.TimeTip);
- foreach (var item in listSumGroup)
+ foreach (var item in dataListSum22)
{
- var listLensnumber1 = listSum.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
+ var listLensnumber1 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
var listLensnumberCount1 = listLensnumber1.Count;
- var listLensnumber2 = listSum.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
+ var listLensnumber2 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
var listLensnumberCount2 = listLensnumber2.Count;
- var listLensnumber3 = listSum.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
+ var listLensnumber3 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
var listLensnumberCount3 = listLensnumber3.Count;
- var listLensnumber4 = listSum.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
+ var listLensnumber4 = listSum.FindAll(a => a.TimeTip == item&& a.Lensnumber == 4);
var listLensnumberCount4 = listLensnumber4.Count;
//绗竴琛�
- var content1 = $"{item.Key},{1},{listLensnumberCount1}";
+ var content1 = $"{item},{1},{listLensnumberCount1}";
File.AppendAllText(file, content1, Encoding.UTF8);
File.AppendAllText(file, "\r\n");
//绗簩琛�
@@ -218,7 +226,7 @@
}
- private List<ResultData> CompareFile(FileInfo fileInfo1, FileInfo fileInfo2)
+ private List<ResultData> CompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor)
{
var allLines1 = File.ReadAllLines(fileInfo1.FullName, Encoding.Default);
var allLines2 = File.ReadAllLines(fileInfo2.FullName, Encoding.Default);
@@ -235,28 +243,10 @@
- #region //灏嗘椂闂存埑鐩稿悓鐨勫垎涓轰竴缁勫苟鎺掑簭
-
- var dataGroup1 = dataList1.GroupBy(a => a.TimeTip);
- var dataGroup2 = dataList2.GroupBy(a => a.TimeTip);
- var dataListSum = new List<string>();
-
- foreach (var item in dataGroup1)
- {
- dataListSum.Add(item.Key);
- }
- foreach (var item in dataGroup2)
- {
- dataListSum.Add(item.Key);
- }
- dataListSum = dataListSum.Distinct().ToList();
- dataListSum.Sort();
- #endregion
-
var dataList = new List<ResultData>();
var dataList11 = new List<ResultData>();
var dataList22 = new List<ResultData>();
- foreach (var item in dataListSum)
+ foreach (var item in DataTipsor)
{
var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
@@ -307,90 +297,19 @@
list2.Remove(itemToRemove[i]);
}
- dataList11.AddRange(list1);
- dataList22.AddRange(list2);
+ dataList.AddRange(list1);
+ dataList.AddRange(list2);
}
- dataList.AddRange(dataList1);
- dataList.AddRange(dataList2);
+ //dataList.AddRange(dataList1);
+ //dataList.AddRange(dataList2);
return dataList;
}
//缁熻璁惧鍒ゆ柇缁撴灉
- private List<ResultData> JudgeCompareFile(FileInfo fileInfo1, FileInfo fileInfo2)
+ private List<ResultData> JudgeCompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor)
{
- #region //灞忚斀
- //var allLines1 = File.ReadAllLines(fileInfo1.FullName,Encoding.Default);
- //var allLines2 = File.ReadAllLines(fileInfo2.FullName, Encoding.Default);
- ////var dataJudgeList1 = GetJudgeData(allLines1);
- ////var dataJudgeList2 = GetJudgeData(allLines2);
- //List<ResultData> dataJudgeList1 = new List<ResultData>();
- //List<ResultData> dataJudgeList2 = new List<ResultData>();
- //if (allLines1.Length > 1)
- //{
- // dataJudgeList1 = GetData(allLines1);
- //}
- //if (allLines2.Length > 1)
- //{
-
- // dataJudgeList2 = GetData(allLines2);
- //}
-
- //var dataGroup1 = dataJudgeList1.GroupBy(a => a.TimeTip);
- //var dataGroup2 = dataJudgeList2.GroupBy(a => a.TimeTip);
- //var dataListSum = new List<string>();
-
- //foreach (var item in dataGroup1)
- //{
- // dataListSum.Add(item.Key);
- //}
- //foreach (var item in dataGroup2)
- //{
- // dataListSum.Add(item.Key);
- //}
- //dataListSum = dataListSum.Distinct().ToList();
- //dataListSum.Sort();
- //var dataList = new List<ResultData>();
- //var itemToRemove = new List<ResultData>();
- //foreach (var item in dataListSum)
- //{
-
- // var list1 = dataJudgeList1.FindAll(a => a.TimeTip == item && a.JudgmentResult=="NG"&&!a.Result);
- // var list2 = dataJudgeList2.FindAll(a => a.TimeTip == item && a.JudgmentResult == "NG"&&!a.Result);
- // for (int i = 0; i < list1.Count; i++)
- // {
- // for (int j = 0; j < list2.Count; j++)
- // {
- // if (list1[i].JudgmentResult != list2[j].JudgmentResult)
- // {
- // list1[i].JudgmentResult = "NG";
- // list2[j].JudgmentResult = "NG";
- // itemToRemove.Add(list2[j]);
- // }
- // if (list1[i].JudgmentResult == list2[j].JudgmentResult)
- // {
- // itemToRemove.Add(list2[j]);
- // }
- // }
- // }
- // //if (list1.Count ==0&&list2.Count==0)
- // //{
- // // dataList.Add(new ResultData()
- // // {
- // // TimeTip = item,
- // // JudgmentResult = "OK",
-
- // // }); ; ;
- // //}
- // dataList.AddRange(list1);
- // dataList.AddRange(list2);
- //}
- //for (int i = 0; i < itemToRemove.Count; i++)
- //{
- // dataList.Remove(itemToRemove[i]);
- //}
- #endregion
var allLines1 = File.ReadAllLines(fileInfo1.FullName, Encoding.Default);
var allLines2 = File.ReadAllLines(fileInfo2.FullName, Encoding.Default);
@@ -407,28 +326,10 @@
- #region //灏嗘椂闂存埑鐩稿悓鐨勫垎涓轰竴缁勫苟鎺掑簭
-
- var dataGroup1 = dataList1.GroupBy(a => a.TimeTip);
- var dataGroup2 = dataList2.GroupBy(a => a.TimeTip);
- var dataListSum = new List<string>();
-
- foreach (var item in dataGroup1)
- {
- dataListSum.Add(item.Key);
- }
- foreach (var item in dataGroup2)
- {
- dataListSum.Add(item.Key);
- }
- dataListSum = dataListSum.Distinct().ToList();
- dataListSum.Sort();
- #endregion
-
var dataList = new List<ResultData>();
var dataList11 = new List<ResultData>();
var dataList22 = new List<ResultData>();
- foreach (var item in dataListSum)
+ foreach (var item in DataTipsor)
{
var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
@@ -490,35 +391,15 @@
}
//var itemToRemove = new List<ResultData>();
- foreach (var item in dataListSum)
+ foreach (var item in DataTipsor)
{
var list1 = dataList11.FindAll(a => a.TimeTip == item/* && a.JudgmentResult == "NG"*/ ); //涓嶇OK銆丯G閮借杈撳嚭
var list2 = dataList22.FindAll(a => a.TimeTip == item /*&& a.JudgmentResult == "NG"*/); //涓嶇OK銆丯G閮借杈撳嚭
- //for (int i = 0; i < list1.Count; i++)
- //{
- // for (int j = 0; j < list2.Count; j++)
- // {
- // if (list1[i].JudgmentResult != list2[j].JudgmentResult)
- // {
- // list1[i].JudgmentResult = "NG";
- // list2[j].JudgmentResult = "NG";
- // itemToRemove.Add(list2[j]);
- // }
- // if (list1[i].JudgmentResult == list2[j].JudgmentResult)
- // {
- // itemToRemove.Add(list2[j]);
- // }
- // }
- //}
dataList.AddRange(list1);
dataList.AddRange(list2);
}
- //for (int i = 0; i < itemToRemove.Count; i++)
- //{
- // dataList.Remove(itemToRemove[i]);
- //}
return dataList;
@@ -534,46 +415,60 @@
//{
// 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];
- }
+ //if (data.Length>10)
+ //{
+ // Ptr = data[10];
+ //}
-
- if (data[6]=="-")
- {
- continue;
- }
-
- string defectType = "";
- string bbb = "";
//string Ptr = "";
if (data[0] == "")
{
data[0] = nametemp;
data[1] = resulttemp;
- //data[10] = Ptr;
+ if (data[3] != "鍒櫧")
+ {
+ data[10] = Ptr;
+ }
}
- if (data[1]== "鍒櫧")
+ if (data[3]== "鍒櫧")
{
defectType = "鍒櫧";
- bbb = "NG";
- Ptr = "";
+ judgmentresult = "NG";
+ Ptr = "鍒櫧";
}
else
{
defectType = "鐧界偣";
- bbb = data[1];
+ judgmentresult = data[1];
+
+ }
+
+ if (data[6] == "-")
+ {
+
+ dataList.Add(new ResultData()
+ {
+ TimeTip = data[0].Split('-')[0],
+ ImageFileName = data[0],
+ JudgmentResult = data[1],
+ Result = data[3] == "OK",
+ DefectType = defectType,
+
+ }); ; ;
+
+ continue;
}
var data6 = data[6].Split('#').ToList();
@@ -599,12 +494,20 @@
}
}
data[7] = Convert.ToString(temp7);
+ if (data[3]=="NG")
+ {
+ Ptr = data[10];
+ }
+ else
+ {
+ Ptr = "";
+ }
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
ImageFileName = data[0],
- JudgmentResult = bbb,
+ JudgmentResult = judgmentresult,
Result = data[3] == "OK",
Probability = Convert.ToDouble(data[4]),
Uncertainty = Convert.ToDouble(data[5]),
@@ -627,39 +530,7 @@
return dataList;
}
- //private List<ResultData> GetJudgeData(string[] allLines)
- //{
- // var dataList = new List<ResultData>();
- // for (int i = 1; i < allLines.Length; i++)
- // {
- // var data = allLines[i].Split(',');
- // string defectType = "";
- // string aaa = "";
- // if (data[0] != "")
- // {
- // try
- // {
- // defectType = data[10];
- // }
- // catch (Exception)
- // {
-
- // defectType = "鍒櫧";
- // aaa = "NG";
- // }
-
- // dataList.Add(new ResultData()
- // {
- // TimeTip = data[0].Split('-')[0],
- // JudgmentResult = aaa,
- // DefectType= defectType,
-
- // }); ; ;
- // }
-
- // }
- // return dataList;
- //}
+
private List<ResultData> GetLocation(List<ResultData> list)
{
@@ -791,13 +662,13 @@
{
if (Lens[i].DefectType == "鍒櫧")
{
- var content111 = $"{""},{""},{""},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
+ var content111 = $"{""},{""},{""},{""},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
File.AppendAllText(file12, content111, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
}
else
{
- var content111 = $"{""},{""},{""},{Lens[i].DefectType},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
+ var content111 = $"{""},{""},{""},{Lens[i].DefectType},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
File.AppendAllText(file12, content111, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
}
@@ -806,12 +677,12 @@
}
else
{
- var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
+ var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType},{Lens[0].PostTreatmentResults}";
File.AppendAllText(file12, content11, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
for (int i = 0; i < Lens.Count; i++)
{
- var content111 = $"{""},{""},{""},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
+ var content111 = $"{""},{""},{""},{""},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
File.AppendAllText(file12, content111, Encoding.UTF8);
File.AppendAllText(file12, "\r\n");
}
--
Gitblit v1.8.0