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 | 100 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 85 insertions(+), 15 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index b6ce01a..3a052e5 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -75,6 +75,8 @@
string filenameDir = "";
int WhiteI = 0;
int WhiteningI = 0;
+ int ScratchI = 0;
+ int ZoomI = 0;
int ChuNum = 0;
int FuNum = 0;
int GuaNum = 0;
@@ -83,7 +85,7 @@
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>();
@@ -94,9 +96,12 @@
dataListSum22 = dataListSum22.Distinct().ToList();
dataListSum22.Sort();
#endregion
-
- for (int i = 0; i < fileInfo1.Count; i++)
+
+ //濡傛灉闇�瑕佸悎骞惰〃鏍煎氨鎵ц
+ 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)*/
@@ -188,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鎶ヨ〃涓�
@@ -257,13 +275,18 @@
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>();
foreach (var item in DataTipsor)
@@ -752,13 +775,40 @@
return Math.Atan2((y1 - size), (x1 - size)) * (180 / Math.PI);
}
- private List<ResultData> GetData(string[] allLines)
+
+ //鑾峰彇鏂囦欢鍚嶇О骞剁‘瀹氱己闄风被鍨�
+ 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 = "";
- string defectType = "";
for (int i = 1; i < allLines.Length; i++)
{
@@ -769,22 +819,26 @@
{
data[0] = nametemp;
data[1] = resulttemp;
- if (data[3] != "鍒櫧")
+ if (defectType == "鐧界偣")
{
data[10] = Ptr;
}
+
}
- if (data[3] == "鍒櫧")
+ if (defectType == "鍒櫧")
{
- defectType = "鍒櫧";
Ptr = "鍒櫧";
}
- else
+ else if (defectType == "鍒掍激")
{
- defectType = "鐧界偣";
+ Ptr = "鍒掍激";
+ }
+ else if (defectType == "鐧界偣")
+ {
Ptr = data[10];
}
+
if (data[6] == "-")
{
@@ -793,15 +847,29 @@
{
TimeTip = data[0].Split('-')[0],
ImageFileName = data[0],
- JudgmentResult = data[1],
+ JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
- DefectType = defectType,
}); ; ;
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]);
@@ -827,11 +895,13 @@
data[7] = Convert.ToString(temp7);
+
+
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
ImageFileName = data[0],
- JudgmentResult = data[1],
+ JudgmentResult = data[1]=="OK" ? "OK" :"NG",
Result = data[3] == "OK",
Probability = Convert.ToDouble(data[4]),
Uncertainty = Convert.ToDouble(data[5]),
--
Gitblit v1.8.0