P066.Data.git - Gitblit

			@@ -67,8 +67,80 @@


			}




			private void btnAnalyze_Click(object sender, EventArgs e)
			{


			//读取全部表格
			var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
			var listAllSum = new List<ResultData>();
			List<Task> listTask = new List<Task>();
			var DataTipsort = new List<string>();
			for (int i = 0; i < fileinfos1.Count; i++)
			{
			int index = i;
			var task = Task.Run(() =>
			{
			listAllSum.AddRange(GetFileData(fileinfos1[index]));
			});
			listTask.Add(task);
			}
			DataTipsort = readfile.TimeStamp(fileinfos1[0]);//读取一个文件夹的时间戳
			Task.WaitAll(listTask.ToArray());//等全部读取完后再进行下一步
			Dictionary<int, string> dictionary = new Dictionary<int, string>();
			dictionary.Add(1, "初检中框镜头");
			dictionary.Add(2, "复检中框镜头");
			dictionary.Add(3, "初检背板镜头");
			dictionary.Add(4, "复检背板镜头");
			List<ResultData> listCompareSum = new List<ResultData>();
			for (int j = 1; j < 5; j++)
			{
			int indexMax = j;
			for (int i = 1; i < 5; i++)
			{
			int index = i;
			Task task = Task.Run(() =>
			{
			listCompareSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 1 + "白点"),
			listAllSum.FindAll(a => a.FileName == dictionary[indexMax] + index + "_" + 2 + "白点"), DataTipsort));
			});

			listTask.Add(task);
			}
			}
			for (int i = 1; i < 5; i++)
			{
			int index = i;
			Task task = Task.Run(() =>
			{
			listCompareSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 1 + "刮白"),
			listAllSum.FindAll(a => a.FileName == dictionary[2] + index + "_" + 2 + "刮白"), DataTipsort));
			});

			listTask.Add(task);
			}

			Task.WaitAll(listTask.ToArray());
















			var Start = DateTime.Now;
			#region 读取文件夹下的所有文件，并将文件按照上下进行区分;上表格为fileInfo1，下表格为fileInfo2
			List<FileInfo> fileInfo1 = new List<FileInfo>();
			@@ -97,8 +169,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);
			@@ -161,7 +232,7 @@
			var taskReexamination = Task.Run (() =>
			{
			//复检报表
			ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
			//ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));



			@@ -169,17 +240,13 @@
			var taskPreliminary = Task.Run(() =>
			{
			//初检报表
			ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); //合并初检上下报表，输出合并后数据
			/* ListPreliminarySum.AddRange(GetClassificationLens(fileInfo3, fileInfo4, DataTipsor)); */ //合并初检上下报表，输出合并后数据


			});

			taskReexamination.Wait();

			var Lens1sum = ListReexaminationSum.FindAll(a => a.DefectType=="刮白" && a.Lensnumber == 1);
			var Lens2sum = ListReexaminationSum.FindAll(a => a.DefectType == "刮白" && a.Lensnumber == 2);
			var Lens3sum = ListReexaminationSum.FindAll(a => a.DefectType == "刮白" && a.Lensnumber == 3);
			var Lens4sum = ListReexaminationSum.FindAll(a => a.DefectType == "刮白" && a.Lensnumber == 4);



			@@ -485,15 +552,14 @@
			}

			#region 两个表格进行比较,如果两个表格中有设备判断标准不统一，将该点变为NG，删除两个表格中NG点相近的最小尺寸点.
			private List<ResultData> CompareFile(FileInfo fileInfo1, FileInfo fileInfo2,List<string> DataTipsor)
			private List<ResultData> CompareFile(List<ResultData> listOne, List<ResultData> listTwo,List<string> DataTipsort)
			{
			var dataList1 = GetFileData(fileInfo1);
			var dataList2 = GetFileData(fileInfo2);

			var dataList = new List<ResultData>();
			foreach (var item in DataTipsor)
			foreach (var item in DataTipsort)
			{
			var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
			var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
			var list1 = listOne.FindAll(a => a.TimeTip == item && !a.Result);
			var list2 = listTwo.FindAll(a => a.TimeTip == item && !a.Result);
			var itemToRemove = new List<ResultData>();
			//计算表格1最大尺寸
			GetMaxSize(list1);
			@@ -971,59 +1037,47 @@
			#endregion

			#region 获取白点、刮白数据并按镜头输出
			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);
			//private List<ResultData> GetClassificationLens(List<FileInfo> fileInfo1, List<FileInfo> fileInfo2, List<string> DataTipsor)
			//{
			// List<ResultData> ListReexaminationSum = new List<ResultData>();
			// 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);

			// ListReexaminationSum.AddRange(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);
			// 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;
			}
			// }
			// Task.WaitAll(listTask.ToArray());
			// return ListReexaminationSum;
			//}
			#endregion

			#region //统计设备未清除数、复检多检出数