1.0428数据

Administrator

2021-04-28 ce17c37300daf7a883d5f0c136c3170a9bcaa624

 P066.Data/Form1.cs

@@ -74,51 +74,50 @@
        private void btnAnalyze_Click(object sender, EventArgs e)
        {


                //读取全部表格
            var fileinfos1 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");
            List<ResultData> listSum = new List<ResultData>();
            var listAllSum = new List<ResultData>();
            List<Task> listTask = new List<Task>();
            for (int i = 0; i < fileinfos1.Count; i++)
            {
                int index = i;
                var task = Task.Run(() =>
                {


                    listAllSum.AddRange(GetFileData(fileinfos1[index]));

                });
                listTask.Add(task);
            }

          
            Task.WaitAll(listTask.ToArray());
            var TipGrp = listAllSum.FindAll(a => a.FileName=="复检中框镜头1_1白点").GroupBy(a=>a.TimeTip);
            var DataTipsort = new List<string>();
            foreach (var item in TipGrp)
            {
                DataTipsort.Add(item.Key);
            }
            DataTipsort.Distinct().ToList().Sort();
           

            //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(() => {
            for (int i = 1; i < 5; i++)
            {
                int index = i;
                Task task = Task.Run(() => {
                    listSum.AddRange(CompareFile(listAllSum.FindAll(a => a.FileName == "初检中框镜头" + index + "_" + 1 + "白点"),
                       listAllSum.FindAll(a => a.FileName == "初检中框镜头" + index + "_" + 2 + "白点"), DataTipsort));
                });

                    
            //       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(() => {
                listTask.Add(task);
            }


            //        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);

            //}
             Task.WaitAll(listTask.ToArray());



@@ -126,7 +125,16 @@



                var Start = DateTime.Now;









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


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

                
            });
@@ -537,15 +545,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);
@@ -1023,47 +1030,47 @@
        #endregion

        #region  获取白点、刮白数据并按镜头输出
        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);
        //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);
        //                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   //统计设备未清除数、复检多检出数