1.修复脏污、划伤有时无法写入报表中。

Administrator

2021-03-19 2f92f84f6af2f9a65e7c6e04ccb3792433233a1e

 P066.Data/Form1.cs

@@ -49,11 +49,13 @@
        private void btnAnalyze_Click(object sender, EventArgs e)
        {

            var fileinfos11 = directoryInfo1.GetFiles();
            //var fileinfos22 = directoryInfo2.GetFiles();
            var fileinfos11 = directoryInfo1.GetFiles().ToList().FindAll(a => a.Extension == ".csv");


            ;
            List<FileInfo> fileInfo1 = new List<FileInfo>();
            List<FileInfo> fileInfo2 = new List<FileInfo>();
            for (int i = 0; i < fileinfos11.Length; i++)
            for (int i = 0; i < fileinfos11.Count; i++)
            {
                if (fileinfos11[i].Name.Contains("1_1") || fileinfos11[i].Name.Contains("2_1") || fileinfos11[i].Name.Contains("3_1") || fileinfos11[i].Name.Contains("4_1") )
                {
@@ -63,10 +65,7 @@
                {
                    fileInfo2.Add(fileinfos11[i]);
                }


            }


            List<ResultData> DataListMerge = new List<ResultData>();
            var listSum = new List<ResultData>();
@@ -75,6 +74,8 @@
            string filenameDir = "";
            int WhiteI = 0;
            int WhiteningI = 0;
            int ScratchI = 0;
            int ZoomI = 0;
            int ChuNum = 0;
            int FuNum = 0;
            int GuaNum = 0;
@@ -83,7 +84,7 @@
            List<ResultData> dataList1 = new List<ResultData>();
            if (allLines1.Length > 1)
            {
                dataList1 = GetData(allLines1);
                dataList1 = GetData(allLines1,GetDefactType(fileInfo1[0]));
            }
            var dataGroup111 = dataList1.GroupBy(a => a.TimeTip);
            var dataListSum22 = new List<string>();
@@ -94,9 +95,40 @@
            dataListSum22 = dataListSum22.Distinct().ToList();
            dataListSum22.Sort();
            #endregion
           
            for (int i = 0; i < fileInfo1.Count; i++)

            if (directoryInfo2 != null)
            {
                var fileinfos22 = directoryInfo2.GetFiles().ToList().FindAll(a=>a.Extension==".csv");

                for (int i = 0; i < fileinfos22.Count; i++)
            {
                var allLines = File.ReadAllLines(fileinfos22[i].FullName, Encoding.Default);
                var list = GetData(allLines, GetDefactType(fileinfos22[i])).FindAll(a=>!a.Result);      /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/
                GetMaxSize(list);
                if (fileinfos22[i].Name.Contains("划伤"))
                {
                    ScratchI++;
                    list.ForEach(a => a.Lensnumber = ScratchI);
                    listSum.AddRange(list);
                    list = GetBkLocation(list);
                }
                else if (fileinfos22[i].Name.Contains("镀膜破损"))
                {
                    ZoomI++;
                    list.ForEach(a => a.Lensnumber = ZoomI);
                    listSum.AddRange(list);
                }

            }

                directoryInfo2 = null;
            }




            for (int i = 0; i < fileInfo1.Count; i++)
             {
                CompareFile(fileInfo1[i], fileInfo2[i], dataListSum22, out DataListMerge);
                var list = DataListMerge;      /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/

@@ -188,8 +220,8 @@


                }
            }

             }
            

            #region//将设备判断结果输出到CSV报表中
            var title12 = $"时间戳,相机序号,设备判断结果,缺陷类型,设备后处理结果,最大尺寸,位置,X,Y,R,角度";
@@ -257,13 +289,18 @@
            var allLines2 = File.ReadAllLines(fileInfo2.FullName, Encoding.Default);
            List<ResultData> dataList1 = new List<ResultData>();
            List<ResultData> dataList2 = new List<ResultData>();
            string defectType1 = "";
            string defectType2 = "";
            defectType1 = GetDefactType(fileInfo1);
            defectType2 = GetDefactType(fileInfo2);

            if (allLines1.Length>1)
            {
                dataList1 = GetData(allLines1);
                dataList1 = GetData(allLines1,defectType1);
            }
            if (allLines2.Length > 1)
            {
                dataList2 = GetData(allLines2);
                dataList2 = GetData(allLines2,defectType2);
            }
            var dataList = new List<ResultData>();
            foreach (var item in DataTipsor)
@@ -271,33 +308,13 @@
                var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
                var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
                var itemToRemove = new List<ResultData>();
                #region//计算表格2最大尺寸
                for (int ii = 0; ii < list2.Count; ii++)
                {
                    if (list2[ii].Width > list2[ii].Height)
                    {
                        list2[ii].ex = list2[ii].Width * 0.0043;
                    }
                    else
                    {
                        list2[ii].ex = list2[ii].Height * 0.0043;
                    }

                }
                #endregion  
                //计算表格1最大尺寸
                GetMaxSize(list1);
                //计算表格2最大尺寸
                GetMaxSize(list2);
                for (int i = 0; i < list1.Count; i++)
                {
                    #region//计算表格1最大尺寸
                    if (list1[i].Width > list1[i].Height)
                    {
                        list1[i].ex = list1[i].Width * 0.0043;
                    }
                    else
                    {
                        list1[i].ex = list1[i].Height * 0.0043;
                    }

                    #endregion
                    for (int j = 0; j < list2.Count; j++)
                    {
                        if (list1[i].JudgmentResult != list2[j].JudgmentResult)
@@ -702,7 +719,51 @@
            }
            else
            {
                if (Lens[0].DefectType == "刮白")
                if (Lens[0].DefectType == "镀膜破损")
                {
                    var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
                    File.AppendAllText(file12, content11, Encoding.UTF8);
                    File.AppendAllText(file12, "\r\n");
                    for (int i = 0; i < Lens.Count; i++)
                    {
                        if (Lens[i].DefectType == "镀膜破损")
                        {
                            var content111 = $"{""},{""},{""},{""},{""},{"-"},{"-"},{"-"},{"-"},{"-"},{"-"}";
                            File.AppendAllText(file12, content111, Encoding.UTF8);
                            File.AppendAllText(file12, "\r\n");
                        }
                        else
                        {
                            var content111 = $"{""},{""},{""},{Lens[i].DefectType},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
                            File.AppendAllText(file12, content111, Encoding.UTF8);
                            File.AppendAllText(file12, "\r\n");
                        }

                    }
                }
                else if (Lens[0].DefectType == "划伤"|| Lens[0].DefectType == "脏污")
                {
                    var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
                    File.AppendAllText(file12, content11, Encoding.UTF8);
                    File.AppendAllText(file12, "\r\n");
                    for (int i = 0; i < Lens.Count; i++)
                    {
                        if (Lens[i].DefectType == "划伤"|| Lens[i].DefectType == "脏污")
                        {
                            var content111 = $"{""},{""},{""},{""},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
                            File.AppendAllText(file12, content111, Encoding.UTF8);
                            File.AppendAllText(file12, "\r\n");
                        }
                        else
                        {
                            var content111 = $"{""},{""},{""},{Lens[i].DefectType},{""},{Lens[i].ex},{Lens[i].location},{Lens[i].X},{Lens[i].Y},{(int)(Lens[i].R)},{(int)(Lens[i].angle)}";
                            File.AppendAllText(file12, content111, Encoding.UTF8);
                            File.AppendAllText(file12, "\r\n");
                        }

                    }
                }
                else if (Lens[0].DefectType == "刮白")
                {
                    var content11 = $"{item},{LensNumb},{Lens[0].JudgmentResult},{Lens[0].DefectType}";
                    File.AppendAllText(file12, content11, Encoding.UTF8);
@@ -751,14 +812,59 @@
        {
            return Math.Atan2((y1 - size), (x1 - size)) * (180 / Math.PI);
        }
        //计算最大尺寸
        private List<ResultData> GetMaxSize(List<ResultData> list)
        {
            for (int i = 0; i < list.Count; i++)
            {
                if (list[i].Width > list[i].Height)
                {
                    list[i].ex = list[i].Width * 0.0043;
                }
                else
                {
                    list[i].ex = list[i].Height * 0.0043;
                }

        private List<ResultData> GetData(string[] allLines)
            }
            return list;
        }


        //获取文件名称并确定缺陷类型
        private string GetDefactType(FileInfo fileinfo)
        {
            string defatType="";

            if (fileinfo.Name.Contains("白点"))
            {
                defatType= "白点";
            }
            else if (fileinfo.Name.Contains("刮白"))
            {
                defatType = "刮白";
            }
            else if (fileinfo.Name.Contains("镀膜破损"))
            {
                defatType = "镀膜破损";
            }
            else if (fileinfo.Name.Contains("划伤"))
            {
                defatType = "划伤";
            }



            return defatType;
        }

        private List<ResultData> GetData(string[] allLines,string defectType)
        {
            var dataList = new List<ResultData>();
            var nametemp = allLines[1].Split(',')[0];
            var resulttemp = allLines[1].Split(',')[1];
            string Ptr = "";
            string defectType = "";
            string deTy = "";
            for (int i = 1; i < allLines.Length; i++)
            {

@@ -769,23 +875,55 @@
                {
                    data[0] = nametemp;
                    data[1] = resulttemp;
                    if (data[3] != "刮白")
                    if (defectType == "白点")
                    {
                        data[10] = Ptr;
                        deTy = "白点";
                    }


                }
                if (data[3] == "刮白")
                if (defectType == "刮白")
                {
                    defectType = "刮白";
                    Ptr = "刮白";
                }
                else
                {
                    defectType = "白点";
                    Ptr = data[10];
                    deTy = "刮白";
                }

                else if (defectType == "划伤")
                {
                    Ptr = "";
                    if (data[3]!="OK")
                    {
                        deTy = data[3];
                    }
                    else
                    {
                        deTy = "";
                    }

                  
                }

                else if (defectType == "白点")
                {
                    Ptr = data[10];
                    deTy = "白点";
                }

                if (defectType== "镀膜破损")
                {
                    dataList.Add(new ResultData()
                    {
                        TimeTip = data[0].Split('-')[0],
                        ImageFileName = data[0],
                        JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                        Result = data[1] == "OK",
                        DefectType = defectType,

                    }); ; ;

                    continue;
                }
                if (data[6] == "-")
                {

@@ -793,15 +931,29 @@
                    {
                        TimeTip = data[0].Split('-')[0],
                        ImageFileName = data[0],
                        JudgmentResult = data[1],
                        JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                        Result = data[3] == "OK",
                        DefectType = defectType,

                    }); ; ;

                    continue;

                }
               else if (data.Length<5)
                {
                    dataList.Add(new ResultData()
                    {
                        TimeTip = data[0].Split('-')[0],
                        ImageFileName = data[0],
                        JudgmentResult = data[1] == "OK" ? "OK" : "NG",
                        Result = data[3] == "OK",

                    }); ; ;

                    continue;
                }


                var data6 = data[6].Split('#').ToList();
                data6.Remove("");
                var temp6 = Convert.ToInt32(data6[0]);
@@ -827,11 +979,13 @@
                data[7] = Convert.ToString(temp7);




                dataList.Add(new ResultData()
                {
                    TimeTip = data[0].Split('-')[0],
                    ImageFileName = data[0],
                    JudgmentResult = data[1],
                    JudgmentResult = data[1]== "OK" ? "OK" :"NG",
                    Result = data[3] == "OK",
                    Probability = Convert.ToDouble(data[4]),
                    Uncertainty = Convert.ToDouble(data[5]),
@@ -841,13 +995,14 @@
                    Width = Convert.ToDouble(data[7]),
                    X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
                    Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
                    DefectType = defectType,
                    DefectType = deTy,
                    PostTreatmentResults = Ptr,

                }); ; ;

                nametemp = data[0];
                resulttemp = data[1];

                //Ptr = data[10];

            }