From 63993d30a95fcb678768ce3da82b8f01c99223c7 Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-1VKMM8S>
Date: 星期二, 27 四月 2021 19:46:45 +0800
Subject: [PATCH] 1.merge
---
P066.Data/Form1.cs | 76 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 16 deletions(-)
diff --git a/P066.Data/Form1.cs b/P066.Data/Form1.cs
index 1b83998..4863333 100644
--- a/P066.Data/Form1.cs
+++ b/P066.Data/Form1.cs
@@ -67,9 +67,66 @@
}
+
+
+
+
private void btnAnalyze_Click(object sender, EventArgs e)
{
- var Start = DateTime.Now;
+
+
+
+ //var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
+ //List<ResultData> listSum1 = new List<ResultData>();
+ //List<Task> listTask = new List<Task>();
+ //for (int i = 0; i < fileinfos1.Count; i++)
+ //{
+ // int index = i;
+ // var task= Task.Run(() => {
+
+
+ // listSum1.AddRange(GetFileData(fileinfos1[index]));
+
+ // });
+ // listTask.Add(task);
+ //}
+
+ //var fileinfos2 = directoryInfo3.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
+ //List<ResultData> listSum2 = new List<ResultData>();
+
+ //for (int i = 0; i < fileinfos2.Count; i++)
+ //{
+ // int index = i;
+ // var task = Task.Run(() => {
+
+
+ // listSum2.AddRange(GetFileData(fileinfos2[index]));
+
+ // });
+ // listTask.Add(task);
+ //}
+
+
+ //Task.WaitAll(listTask.ToArray());
+
+
+ //List<string> str = new List<string>();
+ //var listsumgrb = listSum2.GroupBy(a => a.FileName);
+ //foreach (var item in listsumgrb)
+ //{
+
+ // var tst = item.Key;
+ // str.Add(item.Key);
+
+ //}
+
+
+
+
+
+
+
+ var Start = DateTime.Now;
#region 璇诲彇鏂囦欢澶逛笅鐨勬墍鏈夋枃浠讹紝骞跺皢鏂囦欢鎸夌収涓婁笅杩涜鍖哄垎;涓婅〃鏍间负fileInfo1锛屼笅琛ㄦ牸涓篺ileInfo2
List<FileInfo> fileInfo1 = new List<FileInfo>();
List<FileInfo> fileInfo2 = new List<FileInfo>();
@@ -97,8 +154,7 @@
var ListReexaminationSum = new List<ResultData>(); //澶嶆鎶ヨ〃鏁版嵁
var ListPreliminarySum = new List<ResultData>(); //鍒濇鎶ヨ〃鏁版嵁
string filenameDir = "";
- int ScratchI = 0;
- int ZoomI = 0;
+
#region 璇诲彇涓�涓〃鏍间腑鎵�鏈夋椂闂存埑骞舵帓搴�
var dataList = GetFileData(fileInfo1[0]);
var dataGroup = dataList.GroupBy(a => a.TimeTip);
@@ -970,27 +1026,15 @@
private List<ResultData> GetClassificationLens(List<FileInfo> fileInfo1, List<FileInfo> fileInfo2, List<string> DataTipsor)
{
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++)
{
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[index].Name.Contains("鍒濇涓"))
{
list = GetMidLocation(list);
--
Gitblit v1.8.0