P066.Data.git - Gitblit

			@@ -18,6 +18,8 @@
			DirectoryInfo directoryInfo1;
			DirectoryInfo directoryInfo2;
			DirectoryInfo directoryInfo3;
			DirectoryInfo directoryInfo4;

			private P066RunParam runparam = new P066RunParam();
			private ReadFile readfile = new ReadFile();
			private WriteFile writefile = new WriteFile();
			@@ -44,6 +46,7 @@
			return;

			directoryInfo2 = new DirectoryInfo(folderBrowserDialog1.SelectedPath);

			}

			private void btnLoadData3_Click(object sender, EventArgs e)
			@@ -54,7 +57,16 @@
			}
			directoryInfo3 = new DirectoryInfo(folderBrowserDialog1.SelectedPath);
			}
			private void butPictur_Click(object sender, EventArgs e)
			{
			if (folderBrowserDialog1.ShowDialog()!=DialogResult.OK)
			{
			return;
			}
			directoryInfo4 = new DirectoryInfo(folderBrowserDialog1.SelectedPath);


			}
			private void btnAnalyze_Click(object sender, EventArgs e)
			{
			var Start = DateTime.Now;
			@@ -109,16 +121,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 +157,9 @@

			});

			Task.WaitAll(task2, task3);
			//Task.WaitAll(task2, task3);


			task2.Wait();
			var task5 = Task.Run(() =>
			{

			@@ -172,6 +184,51 @@


			});

			List<string> listPicyreSor = new List<string>(); //加载图片时间戳
			var directoties = directoryInfo4.GetDirectories();
			for (int i = 0; i < directoties.Length; i++)
			{
			listPicyreSor.Add(directoties[i].Name);
			}
			listPicyreSor.Sort();

			if (listPicyreSor.Count!=0)
			{
			Task.Run(() =>
			{

			#region//将设备判断结果输出到CSV报表中
			//ListReexaminationSum.AddRange(GetClassificationLens(fileInfo1, fileInfo2, DataTipsor));
			var title12 = $"时间戳,相机序号,设备判断结果,缺陷类型,设备后处理结果,最大尺寸,位置,X,Y,R,角度";
			var file12 = $"{directoryInfo1.Parent.FullName}\\{filenameDir + "设备检索结果"}.csv";
			File.AppendAllText(file12, title12, Encoding.UTF8);
			File.AppendAllText(file12, "\r\n");
			foreach (var item in listPicyreSor)
			{
			var Lens1 = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == 1);
			writefile.WriteJR(Lens1, item, 1, file12);
			for (int i = 2; i < 5; i++)
			{
			var Lens = ListReexaminationSum.FindAll(a => a.TimeTip == item && a.Lensnumber == i);
			writefile.WriteJR(Lens, "", i, file12);
			}

			}



			});
			}








			task3.Wait();
			var task6 = Task.Run(() =>
			{

			@@ -243,7 +300,7 @@
			var defectClearSum = listlensum1 - listlennoclearsum1;


			var content1 = $"{i},{defectSum},{defectClearSum},{(double)(defectSum / defectSum)}";
			var content1 = $"{i},{defectSum},{defectClearSum},{(double)(defectSum / defectClearSum)}";
			File.AppendAllText(file1, content1, Encoding.UTF8);
			File.AppendAllText(file1, "\r\n");
			}
			@@ -768,44 +825,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
			@@ -881,3 +946,5 @@


			}

			#endregion