From 7b15567ec12bffd6d286188fa78ddf68874e61b3 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期一, 19 四月 2021 20:29:20 +0800
Subject: [PATCH] 1.merge
---
P066.Data/Form1.cs | 118 ++++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 42 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 1b94c63..cc78022 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -109,16 +109,16 @@
var list = GetFileData(fileinfos22[i]);
if (fileinfos22[i].Name.Contains("鍒掍激"))
{
- ScratchI++;
- list.ForEach(a => a.Lensnumber = ScratchI);
+ //ScratchI++;
+ //list.ForEach(a => a.Lensnumber = ScratchI);
GetMaxSize(list);
GetBkLocation(list);
ListReexaminationSum.AddRange(list);
}
else if (fileinfos22[i].Name.Contains("闀�鑶滅牬鎹�"))
{
- ZoomI++;
- list.ForEach(a => a.Lensnumber = ZoomI);
+ //ZoomI++;
+ //list.ForEach(a => a.Lensnumber = ZoomI);
ListReexaminationSum.AddRange(list);
}
@@ -145,9 +145,9 @@
});
- Task.WaitAll(task2, task3);
+ //Task.WaitAll(task2, task3);
-
+ task2.Wait();
var task5 = Task.Run(() =>
{
@@ -172,6 +172,7 @@
});
+ task3.Wait();
var task6 = Task.Run(() =>
{
@@ -181,9 +182,8 @@
//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>(); //娓呴櫎澶辫触鏁�
+ 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);
@@ -224,6 +224,32 @@
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;
}
@@ -743,44 +769,52 @@
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);
- ListReexaminationSum.AddRange(list);
- }
- else if (fileInfo1[i].Name.Contains("鍒櫧"))
- {
- WhiteningI++;
- list.ForEach(a => a.Lensnumber = WhiteningI);
- ListReexaminationSum.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);
+
}
+ Task.WaitAll(listTask.ToArray());
return ListReexaminationSum;
}
#endregion
--
Gitblit v1.8.0