1.merge

Administrator

2021-04-19 7b15567ec12bffd6d286188fa78ddf68874e61b3

 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(() =>
            {

@@ -768,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