From 2b2050ed6272af429480652974a128234eef29b4 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期四, 18 三月 2021 14:57:17 +0800
Subject: [PATCH] 1.新增划伤、脏污功能未完成。
---
P066.Data/Form1.cs | 614 ++++++++++++++++++++++++++-----------------------------
1 files changed, 287 insertions(+), 327 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 9898e0e..3a052e5 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -49,24 +49,43 @@
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]);
+ }
+
+
+ }
+
+
+ List<ResultData> DataListMerge = new List<ResultData>();
var listSum = new List<ResultData>();
var JudgeListSum = new List<ResultData>();
string filename = "";
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 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)
{
- dataList1 = GetData(allLines1);
+ dataList1 = GetData(allLines1,GetDefactType(fileInfo1[0]));
}
var dataGroup111 = dataList1.GroupBy(a => a.TimeTip);
var dataListSum22 = new List<string>();
@@ -77,79 +96,73 @@
dataListSum22 = dataListSum22.Distinct().ToList();
dataListSum22.Sort();
#endregion
-
- for (int i = 0; i < fileinfos1.Length; i++)
- {
- var list = CompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
- var judgeList = JudgeCompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
- if (fileinfos1[i].Name.Contains("鐧界偣"))
+ //濡傛灉闇�瑕佸悎骞惰〃鏍煎氨鎵ц
+ if (fileInfo1.Count== fileInfo2.Count)
+ {
+ for (int i = 0; i < fileInfo1.Count; i++)
+ {
+ CompareFile(fileInfo1[i], fileInfo2[i], dataListSum22, out DataListMerge);
+ var list = DataListMerge; /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/
+
+ if (fileInfo1[i].Name.Contains("鐧界偣"))
{
WhiteI++;
list.ForEach(a => a.Lensnumber = WhiteI);
listSum.AddRange(list);
- 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);
listSum.AddRange(list);
- judgeList.ForEach(a => a.Lensnumber = WhiteningI);
- JudgeListSum.AddRange(judgeList);
}
string currPath = "";
#region//鍒ゆ柇鏄垵妫�鏂囦欢澶硅繕鏄妫�鏂囦欢澶�
- if (fileinfos1[i].Name.Contains("鍒濇涓"))
+ if (fileInfo1[i].Name.Contains("鍒濇涓"))
{
ChuNum++;
filenameDir = "鍒濇涓鐧界偣";
filename = "鍒濇涓鐧界偣" + ChuNum;
- judgeList = GetMidLocation(judgeList);
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
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 = "澶嶆涓鐧界偣";
filename = "澶嶆涓鐧界偣" + FuNum;
- judgeList = GetMidLocation(judgeList);
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
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 = GetWhiteLocation(judgeList);
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
- list = GetBkLocation(list);
+ list = GetWhiteLocation(list);
}
- else if (fileinfos1[i].Name.Contains("鍒濇鑳屾澘"))
+ else if (fileInfo1[i].Name.Contains("鍒濇鑳屾澘"))
{
ChuNum++;
filenameDir = "鍒濇鑳屾澘鐧界偣";
filename = "鍒濇鑳屾澘鐧界偣" + ChuNum;
- judgeList = GetBkLocation(judgeList);
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
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 = "澶嶆鑳屾澘鐧界偣";
filename = "澶嶆鑳屾澘鐧界偣" + FuNum;
- judgeList = GetBkLocation(judgeList);
//缁欓暅澶村尯鍒嗕綅缃強瑙掑害
list = GetBkLocation(list);
}
- currPath = directoryInfo1.Parent.Parent.FullName;
+ currPath = directoryInfo1.Parent.FullName;
string subPath = currPath + "/" + filenameDir + "鍚堝苟鍚�" + "/";
if (false==Directory.Exists(subPath))
{
@@ -164,22 +177,6 @@
File.AppendAllText(file1, title1, Encoding.UTF8);
File.AppendAllText(file1, "\r\n");
- #region//璁＄畻鎬绘暟
-
- //var group1 = list.GroupBy(a => a.TimeTip);
-
- //var title2 = $"鏃堕棿鎴�,鎬绘暟";
- //var file2 = $"{directoryInfo1.Parent.FullName}\\{ "鎬绘暟" +( i+1)}.csv";
- //File.AppendAllText(file2, title2, Encoding.UTF8);
- //File.AppendAllText(file2, "\r\n");
- //foreach (var item in group1)
- //{
- // var content = $"{item.Key},{item.ToList().Count}";
-
- // File.AppendAllText(file2, content, Encoding.UTF8);
- // File.AppendAllText(file2, "\r\n");
- //}
- #endregion
foreach (var item in dataListSum22)
{
@@ -196,7 +193,20 @@
}
+ }
}
+
+ //涓嶉渶瑕佸悎骞惰〃鏍�
+ else if(fileInfo1.Count>0&& fileInfo2.Count==0)
+ {
+ for (int i = 0; i < fileInfo1.Count; i++)
+ {
+ var allLines = File.ReadAllLines(fileInfo1[i].FullName, Encoding.Default);
+ var list = GetData(allLines,GetDefactType(fileInfo1[i])); /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/
+
+ }
+ }
+
#region//灏嗚澶囧垽鏂粨鏋滆緭鍑哄埌CSV鎶ヨ〃涓�
@@ -206,13 +216,13 @@
File.AppendAllText(file12, "\r\n");
foreach (var item in dataListSum22)
{
- var Lens1 = JudgeListSum.FindAll(a => a.TimeTip == item&&a.Lensnumber==1);
+ var Lens1 = listSum.FindAll(a => a.TimeTip == item&&a.Lensnumber==1);
WriteJR(Lens1,item,1,file12);
- var Lens2 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
+ var Lens2 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 2);
WriteJR(Lens2,"",2,file12);
- var Lens3 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
+ var Lens3 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 3);
WriteJR(Lens3,"",3,file12);
- var Lens4 = JudgeListSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 4);
+ var Lens4 = listSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 4);
WriteJR(Lens4,"",4,file12);
}
@@ -259,27 +269,26 @@
}
-
- private List<ResultData> CompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor)
+ private void CompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor,out List<ResultData> DataListMerger)
{
var allLines1 = File.ReadAllLines(fileInfo1.FullName, Encoding.Default);
var allLines2 = File.ReadAllLines(fileInfo2.FullName, Encoding.Default);
List<ResultData> dataList1 = new List<ResultData>();
List<ResultData> dataList2 = new List<ResultData>();
+ string defectType1 = "";
+ string defectType2 = "";
+ defectType1 = GetDefactType(fileInfo1);
+ defectType2 = GetDefactType(fileInfo2);
+
if (allLines1.Length>1)
{
- dataList1 = GetData(allLines1);
+ dataList1 = GetData(allLines1,defectType1);
}
if (allLines2.Length > 1)
{
- dataList2 = GetData(allLines2);
+ dataList2 = GetData(allLines2,defectType2);
}
-
-
-
var dataList = new List<ResultData>();
- var dataList11 = new List<ResultData>();
- var dataList22 = new List<ResultData>();
foreach (var item in DataTipsor)
{
var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
@@ -290,14 +299,13 @@
{
if (list2[ii].Width > list2[ii].Height)
{
- list2[ii].ex = list2[ii].Width * 0.0042;
+ list2[ii].ex = list2[ii].Width * 0.0043;
}
else
{
- list2[ii].ex = list2[ii].Height * 0.0042;
+ list2[ii].ex = list2[ii].Height * 0.0043;
}
- var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
- list2[ii].R = distance;
+
}
#endregion
for (int i = 0; i < list1.Count; i++)
@@ -305,276 +313,63 @@
#region//璁＄畻琛ㄦ牸1鏈�澶у昂瀵�
if (list1[i].Width > list1[i].Height)
{
- list1[i].ex = list1[i].Width * 0.0042;
+ list1[i].ex = list1[i].Width * 0.0043;
}
else
{
- list1[i].ex = list1[i].Height * 0.0042;
+ list1[i].ex = list1[i].Height * 0.0043;
}
- 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]);
+ }
+
+
+
}
}
}
+ dataList.AddRange(list1);
+ dataList.AddRange(list2);
for (int i = 0; i < itemToRemove.Count; i++)
{
- list2.Remove(itemToRemove[i]);
+ dataList.Remove(itemToRemove[i]);
}
-
- dataList.AddRange(list1);
- dataList.AddRange(list2);
}
-
- //dataList.AddRange(dataList1);
- //dataList.AddRange(dataList2);
- return dataList;
- }
- //缁熻璁惧鍒ゆ柇缁撴灉
- private List<ResultData> JudgeCompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor)
- {
-
-
- var allLines1 = File.ReadAllLines(fileInfo1.FullName, Encoding.Default);
- var allLines2 = File.ReadAllLines(fileInfo2.FullName, Encoding.Default);
- List<ResultData> dataList1 = new List<ResultData>();
- List<ResultData> dataList2 = new List<ResultData>();
- if (allLines1.Length > 1)
- {
- dataList1 = GetData(allLines1);
- }
- if (allLines2.Length > 1)
- {
- dataList2 = GetData(allLines2);
- }
-
-
-
- var dataList = new List<ResultData>();
- var dataList11 = new List<ResultData>();
- var dataList22 = new List<ResultData>();
- 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);
- var itemToRemove1 = new List<ResultData>();
- #region//璁＄畻琛ㄦ牸2鏈�澶у昂瀵�
- for (int ii = 0; ii < list2.Count; ii++)
- {
- if (list2[ii].Width > list2[ii].Height)
- {
- list2[ii].ex = list2[ii].Width * 0.0042;
- }
- else
- {
- list2[ii].ex = list2[ii].Height * 0.0042;
- }
- var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
- list2[ii].R = distance;
- }
- #endregion
- for (int i = 0; i < list1.Count; i++)
- {
- #region//璁＄畻琛ㄦ牸1鏈�澶у昂瀵�
- if (list1[i].Width > list1[i].Height)
- {
- list1[i].ex = list1[i].Width * 0.0042;
- }
- else
- {
- list1[i].ex = list1[i].Height * 0.0042;
- }
- var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
- list1[i].R = distance1;
-
- #endregion
- for (int j = 0; j < list2.Count; j++)
- {
-
- 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)
- {
- list1[i].JudgmentResult = "NG";
- list2[j].JudgmentResult = "NG";
- }
- //if (list1[i].PostTreatmentResults == "")
- //{
- // list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
- //}
- //else
- //{
- // list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
- //}
-
- }
- }
- }
-
- for (int i = 0; i < itemToRemove1.Count; i++)
- {
- list2.Remove(itemToRemove1[i]);
- }
-
- dataList11.AddRange(list1);
- dataList22.AddRange(list2);
- }
-
- //var itemToRemove = new List<ResultData>();
- 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閮借杈撳嚭
-
- dataList.AddRange(list1);
- dataList.AddRange(list2);
- }
-
- return dataList;
+ DataListMerger=dataList;
}
+
- private List<ResultData> GetData(string[] allLines)
- {
- var dataList = new List<ResultData>();
- 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 = "";
- 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;
- data[1] = resulttemp;
- if (data[3] != "鍒櫧")
- {
- data[10] = Ptr;
- }
-
- }
- if (data[3]== "鍒櫧")
- {
- defectType = "鍒櫧";
- Ptr = "鍒櫧";
- }
- else
- {
- defectType = "鐧界偣";
- }
-
- 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();
- data6.Remove("");
- var temp6 = Convert.ToInt32(data6[0]);
- for (int a6 = 0; a6 < data6.Count; a6++)
- {
- if (Convert.ToInt32(data6[a6]) > temp6)
- {
- temp6 = Convert.ToInt32(data6[a6]);
- }
- }
- data[6] = Convert.ToString(temp6);
-
- var data7 = data[7].Split('#').ToList();
- data7.Remove("");
- var temp7 = Convert.ToInt32(data7[0]);
- for (int a7 = 0; a7 < data7.Count; a7++)
- {
- if (Convert.ToInt32(data7[a7]) > temp7)
- {
- temp7 = Convert.ToInt32(data7[a7]);
- }
- }
- 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 = data[1],
- Result = data[3] == "OK",
- Probability = Convert.ToDouble(data[4]),
- Uncertainty = Convert.ToDouble(data[5]),
- //Height = Convert.ToDouble(data[6].Replace("#", "").Replace("-", "")),
- //Width = Convert.ToDouble(data[7].Replace("#", "").Replace("-", "")),
- Height = Convert.ToDouble(data[6]),
- Width = Convert.ToDouble(data[7]),
- X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
- Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
- DefectType = defectType,
- PostTreatmentResults = Ptr,
-
- }) ; ; ;
-
- nametemp = data[0];
- resulttemp= data[1];
- //Ptr = data[10];
-
- }
-
- return dataList;
- }
//鑾峰彇涓瑙掑害鍜屼綅缃�
private List<ResultData> GetMidLocation(List<ResultData> list)
@@ -586,7 +381,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;
@@ -594,6 +389,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 = "闀滃ご";
@@ -612,13 +408,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 = "闀滃ご";
@@ -636,13 +433,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 = "闀滃ご";
@@ -660,13 +458,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 = "闀滃ご";
@@ -685,7 +484,7 @@
}
return list;
}
- //鑾峰彇涓瑙掑害鍜屼綅缃�
+ //鑾峰彇涓鍒櫧瑙掑害鍜屼綅缃�
private List<ResultData> GetWhiteLocation(List<ResultData> list)
{
var group = list.GroupBy(a => a.TimeTip);
@@ -695,7 +494,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;
@@ -703,6 +502,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 = "闀滃ご";
@@ -725,13 +525,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 = "闀滃ご";
@@ -753,13 +554,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 = "闀滃ご";
@@ -781,13 +583,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 = "闀滃ご";
@@ -820,14 +623,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 = "鍙鍖�";
@@ -843,13 +647,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 = "鍙鍖�";
@@ -863,13 +668,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 = "鍙鍖�";
@@ -884,13 +690,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 = "鍙鍖�";
@@ -906,6 +713,7 @@
return list;
}
+ //鍐欏叆璁惧鍒ゆ柇缁撴灉鎶ヨ〃
private void WriteJR(List<ResultData> Lens,string item,int LensNumb, string file12)
{
if (Lens.Count == 0)
@@ -956,16 +764,168 @@
}
-
+ //璁＄畻涓ょ偣涔嬮棿璺濈
private double GetDistance(double x1, double y1, double x2, double y2)
{
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);
}
+
+ //鑾峰彇鏂囦欢鍚嶇О骞剁‘瀹氱己闄风被鍨�
+ private string GetDefactType(FileInfo fileinfo)
+ {
+ string defatType="";
+
+ if (fileinfo.Name.Contains("鐧界偣"))
+ {
+ defatType= "鐧界偣";
+ }
+ else if (fileinfo.Name.Contains("鍒櫧"))
+ {
+ defatType = "鍒櫧";
+ }
+ else if (fileinfo.Name.Contains("闀�鑶滅牬鎹�"))
+ {
+ defatType = "闀�鑶滅牬鎹�";
+ }
+ else if (fileinfo.Name.Contains("鍒掍激"))
+ {
+ defatType = "鍒掍激";
+ }
+
+
+
+ return defatType;
+ }
+
+ private List<ResultData> GetData(string[] allLines,string defectType)
+ {
+ var dataList = new List<ResultData>();
+ var nametemp = allLines[1].Split(',')[0];
+ var resulttemp = allLines[1].Split(',')[1];
+ string Ptr = "";
+ for (int i = 1; i < allLines.Length; i++)
+ {
+
+ var data = allLines[i].Split(',');
+
+
+ if (data[0] == "")
+ {
+ data[0] = nametemp;
+ data[1] = resulttemp;
+ if (defectType == "鐧界偣")
+ {
+ data[10] = Ptr;
+ }
+
+
+ }
+ if (defectType == "鍒櫧")
+ {
+ Ptr = "鍒櫧";
+ }
+ else if (defectType == "鍒掍激")
+ {
+ Ptr = "鍒掍激";
+ }
+ else if (defectType == "鐧界偣")
+ {
+ Ptr = data[10];
+ }
+
+
+ if (data[6] == "-")
+ {
+
+ dataList.Add(new ResultData()
+ {
+ TimeTip = data[0].Split('-')[0],
+ ImageFileName = data[0],
+ JudgmentResult = data[1] == "OK" ? "OK" : "NG",
+ Result = data[3] == "OK",
+
+ }); ; ;
+
+ continue;
+
+ }
+ else if (data.Length<5)
+ {
+ dataList.Add(new ResultData()
+ {
+ TimeTip = data[0].Split('-')[0],
+ ImageFileName = data[0],
+ JudgmentResult = data[1] == "OK" ? "OK" : "NG",
+ Result = data[3] == "OK",
+
+ }); ; ;
+
+ continue;
+ }
+
+
+ var data6 = data[6].Split('#').ToList();
+ data6.Remove("");
+ var temp6 = Convert.ToInt32(data6[0]);
+ for (int a6 = 0; a6 < data6.Count; a6++)
+ {
+ if (Convert.ToInt32(data6[a6]) > temp6)
+ {
+ temp6 = Convert.ToInt32(data6[a6]);
+ }
+ }
+ data[6] = Convert.ToString(temp6);
+
+ var data7 = data[7].Split('#').ToList();
+ data7.Remove("");
+ var temp7 = Convert.ToInt32(data7[0]);
+ for (int a7 = 0; a7 < data7.Count; a7++)
+ {
+ if (Convert.ToInt32(data7[a7]) > temp7)
+ {
+ temp7 = Convert.ToInt32(data7[a7]);
+ }
+ }
+ data[7] = Convert.ToString(temp7);
+
+
+
+
+ dataList.Add(new ResultData()
+ {
+ TimeTip = data[0].Split('-')[0],
+ ImageFileName = data[0],
+ JudgmentResult = data[1]=="OK" ? "OK" :"NG",
+ Result = data[3] == "OK",
+ Probability = Convert.ToDouble(data[4]),
+ Uncertainty = Convert.ToDouble(data[5]),
+ //Height = Convert.ToDouble(data[6].Replace("#", "").Replace("-", "")),
+ //Width = Convert.ToDouble(data[7].Replace("#", "").Replace("-", "")),
+ Height = Convert.ToDouble(data[6]),
+ Width = Convert.ToDouble(data[7]),
+ X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
+ Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
+ DefectType = defectType,
+ PostTreatmentResults = Ptr,
+
+ }); ; ;
+
+ nametemp = data[0];
+ resulttemp = data[1];
+ //Ptr = data[10];
+
+ }
+
+ return dataList;
+ }
+
+
}
public class ResultData
--
Gitblit v1.8.0