c4fa5bc34b30434b9f39f2670c30d10cf9f1cad4..14c9a820cec697c024b2058ba1c63db2f5f84a5e
2021-03-18 Administrator
1.新增程序自动区分文件夹的上、下。
14c9a8 对比 | 目录
2021-03-17 Administrator
1.修改背板尺寸,合并后输出最大尺寸。
c44414 对比 | 目录
1个文件已修改
226 ■■■■■ 已修改文件
P066.Data/Form1.cs 226 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
P066.Data/Form1.cs
@@ -49,9 +49,26 @@
        private void btnAnalyze_Click(object sender, EventArgs e)
        {
            var fileinfos1 = directoryInfo1.GetFiles();
            var fileinfos2 = directoryInfo2.GetFiles();
            var fileinfos11 = directoryInfo1.GetFiles();
            //var fileinfos22 = directoryInfo2.GetFiles();
            List<FileInfo> fileInfo1 = new List<FileInfo>();
            List<FileInfo> fileInfo2 = new List<FileInfo>();
            for (int i = 0; i < fileinfos11.Length; 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") )
                {
                    fileInfo1.Add(fileinfos11[i]);
                }
                else
                {
                    fileInfo2.Add(fileinfos11[i]);
                }
            }
            var listSum = new List<ResultData>();
            var JudgeListSum = new List<ResultData>();
            string filename = "";
@@ -62,7 +79,7 @@
            int FuNum = 0;
            int GuaNum = 0;
            #region//获取时间戳并排序
            var allLines1 = File.ReadAllLines(fileinfos1[0].FullName, Encoding.Default);
            var allLines1 = File.ReadAllLines(fileInfo1[0].FullName, Encoding.Default);
            List<ResultData> dataList1 = new List<ResultData>();
            if (allLines1.Length > 1)
            {
@@ -78,12 +95,12 @@
            dataListSum22.Sort();
            #endregion
           
            for (int i = 0; i < fileinfos1.Length; i++)
            for (int i = 0; i < fileInfo1.Count; i++)
            {
                var list = CompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
                var judgeList = JudgeCompareFile(fileinfos1[i], fileinfos2[i],dataListSum22);
                var list = CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22);
                var judgeList = JudgeCompareFile(fileInfo1[i], fileInfo2[i],dataListSum22);
                if (fileinfos1[i].Name.Contains("白点"))
                if (fileInfo1[i].Name.Contains("白点"))
                {
                    WhiteI++;
                    list.ForEach(a => a.Lensnumber = WhiteI);
@@ -91,7 +108,7 @@
                    judgeList.ForEach(a => a.Lensnumber = WhiteI);
                    JudgeListSum.AddRange(judgeList);
                }
                if (fileinfos1[i].Name.Contains("刮白"))
                if (fileInfo1[i].Name.Contains("刮白"))
                {
                    WhiteningI++;
                    list.ForEach(a => a.Lensnumber = WhiteningI);
@@ -103,7 +120,7 @@
                string currPath = "";
                #region//判断是初检文件夹还是复检文件夹
                if (fileinfos1[i].Name.Contains("初检中框"))
                if (fileInfo1[i].Name.Contains("初检中框"))
                {
                    ChuNum++;
                    filenameDir = "初检中框白点";
@@ -112,7 +129,7 @@
                    //给镜头区分位置及角度
                    list = GetMidLocation(list);
                }
               else if (fileinfos1[i].Name.Contains("复检中框")&& fileinfos1[i].Name.Contains("白点"))
               else if (fileInfo1[i].Name.Contains("复检中框")&& fileInfo1[i].Name.Contains("白点"))
                {
                    FuNum=FuNum+1;
                    filenameDir = "复检中框白点";
@@ -121,7 +138,7 @@
                    //给镜头区分位置及角度
                    list = GetMidLocation(list);
                }
                else if ( fileinfos1[i].Name.Contains("复检中框") &&fileinfos1[i].Name.Contains("刮白"))
                else if (fileInfo1[i].Name.Contains("复检中框") && fileInfo1[i].Name.Contains("刮白"))
                    {
                        GuaNum=GuaNum+1;
                        filenameDir = "复检中框刮白";
@@ -130,7 +147,7 @@
                    //给镜头区分位置及角度
                    list = GetBkLocation(list);
                }
               else if (fileinfos1[i].Name.Contains("初检背板"))
               else if (fileInfo1[i].Name.Contains("初检背板"))
                {
                    ChuNum++;
                    filenameDir = "初检背板白点";
@@ -139,7 +156,7 @@
                    //给镜头区分位置及角度
                    list = GetBkLocation(list);
                }
                else if (fileinfos1[i].Name.Contains("复检背板") && fileinfos1[i].Name.Contains("白点"))
                else if (fileInfo1[i].Name.Contains("复检背板") && fileInfo1[i].Name.Contains("白点"))
                {
                    FuNum = FuNum + 1;
                    filenameDir = "复检背板白点";
@@ -149,7 +166,7 @@
                    list = GetBkLocation(list);
                }
                currPath = directoryInfo1.Parent.Parent.FullName;
                currPath = directoryInfo1.Parent.FullName;
                string subPath = currPath + "/" + filenameDir + "合并后" + "/";
                if (false==Directory.Exists(subPath))
                {
@@ -296,8 +313,8 @@
                    {
                        list2[ii].ex = list2[ii].Height * 0.0042;
                    }
                    var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
                    list2[ii].R = distance;
                    //var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
                    //list2[ii].R = distance;
                }
                #endregion  
                for (int i = 0; i < list1.Count; i++)
@@ -311,36 +328,52 @@
                    {
                        list1[i].ex = list1[i].Height * 0.0042;
                    }
                    var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
                    list1[i].R = distance1;
                    //var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
                    //list1[i].R = distance1;
                    #endregion
                    for (int j = 0; j < list2.Count; j++)
                    {
                        if (list1[i].JudgmentResult != list2[j].JudgmentResult)
                        {
                            list1[i].JudgmentResult = "NG";
                            list2[j].JudgmentResult = "NG";
                        }
                        if (list1[i].PostTreatmentResults.Length<list2[j].PostTreatmentResults.Length)
                        {
                            list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
                        }
                        else
                        {
                            list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
                        }
                        var distance = GetDistance(list1[i].X, list1[i].Y, list2[j].X, list2[j].Y);
                        if (distance < 20)
                        {
                            itemToRemove.Add(list2[j]);
                            //if (list1[i].PostTreatmentResults=="")
                            //{
                            //    list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
                            //}
                            //else
                            //{
                            //    list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
                            //}
                            if (list1[i].ex>list2[j].ex)
                            {
                                itemToRemove.Add(list2[j]);
                            }
                            else
                            {
                                itemToRemove.Add(list1[i]);
                            }
                        }
                    }
                }
                for (int i = 0; i < itemToRemove.Count; i++)
                {
                    list2.Remove(itemToRemove[i]);
                }
                dataList.AddRange(list1);
                dataList.AddRange(list2);
                for (int i = 0; i < itemToRemove.Count; i++)
                {
                    dataList.Remove(itemToRemove[i]);
                }
            }
@@ -376,6 +409,7 @@
                var list1 = dataList1.FindAll(a => a.TimeTip == item && !a.Result);
                var list2 = dataList2.FindAll(a => a.TimeTip == item && !a.Result);
                var itemToRemove1 = new List<ResultData>();
                var itemToRemove2 = new List<ResultData>();
                #region//计算表格2最大尺寸
                for (int ii = 0; ii < list2.Count; ii++)
                {
@@ -387,8 +421,8 @@
                    {
                        list2[ii].ex = list2[ii].Height * 0.0042;
                    }
                    var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
                    list2[ii].R = distance;
                    //var distance = GetDistance(1050, 1050, list2[ii].X, list2[ii].Y);
                    //list2[ii].R = distance;
                }
                #endregion  
                for (int i = 0; i < list1.Count; i++)
@@ -402,22 +436,46 @@
                    {
                        list1[i].ex = list1[i].Height * 0.0042;
                    }
                    var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
                    list1[i].R = distance1;
                    //var distance1 = GetDistance(1050, 1050, list1[i].X, list1[i].Y);
                    //list1[i].R = distance1;
                    #endregion
                    for (int j = 0; j < list2.Count; j++)
                    {
                        if (list1[i].JudgmentResult != list2[j].JudgmentResult)
                        {
                            list1[i].JudgmentResult = "NG";
                            list2[j].JudgmentResult = "NG";
                        }
                        if (list1[i].PostTreatmentResults.Length < list2[j].PostTreatmentResults.Length)
                        {
                            list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
                        }
                        else
                        {
                            list2[j].PostTreatmentResults = list1[i].PostTreatmentResults;
                        }
                        var distance = GetDistance(list1[i].X, list1[i].Y, list2[j].X, list2[j].Y);
                        if (distance < 20)
                        {
                            itemToRemove1.Add(list2[j]);
                            if (list1[i].JudgmentResult!=list2[j].JudgmentResult)
                            if (list1[i].ex > list2[j].ex)
                            {
                                list1[i].JudgmentResult = "NG";
                                list2[j].JudgmentResult = "NG";
                                itemToRemove2.Add(list2[j]);
                            }
                            else
                            {
                                itemToRemove1.Add(list1[i]);
                            }
                            //if (list1[i].JudgmentResult!=list2[j].JudgmentResult)
                            //{
                            //    list1[i].JudgmentResult = "NG";
                            //    list2[j].JudgmentResult = "NG";
                            //}
                            //if (list1[i].PostTreatmentResults == "")
                            //{
                            //    list1[i].PostTreatmentResults = list2[j].PostTreatmentResults;
@@ -431,11 +489,14 @@
                    }
                }
                for (int i = 0; i < itemToRemove2.Count; i++)
                {
                    list2.Remove(itemToRemove2[i]);
                }
                for (int i = 0; i < itemToRemove1.Count; i++)
                {
                    list2.Remove(itemToRemove1[i]);
                    list1.Remove(itemToRemove1[i]);
                }
                dataList11.AddRange(list1);
                dataList22.AddRange(list2);
            }
@@ -461,25 +522,13 @@
            var nametemp = allLines[1].Split(',')[0];
            var resulttemp = allLines[1].Split(',')[1];
            string Ptr = "";
            //if (allLines[1].Split(',')[10].Length>3)
            //{
            //     Ptr = allLines[1].Split(',')[10];
            //}
            string defectType = "";
            for (int i = 1; i < allLines.Length; i++)
            {
                var data = allLines[i].Split(',');
                //if (data.Length>10)
                //{
                //    Ptr = data[10];
                //}
                //string Ptr = "";
                if (data[0] == "")
                {
                    data[0] = nametemp;
@@ -498,6 +547,7 @@
                else
                {
                    defectType = "白点";
                    Ptr = data[10];
                }
                if (data[6] == "-")
@@ -539,14 +589,14 @@
                    }
                }
                data[7] = Convert.ToString(temp7);
                if (data[3]=="NG")
                {
                    Ptr = data[10];
                }
                else
                {
                    Ptr = "";
                }
                //if (data[3]=="NG")
                //{
                //    Ptr = data[10];
                //}
                //else
                //{
                //    Ptr = "";
                //}
                dataList.Add(new ResultData()
                {
@@ -586,7 +636,7 @@
                var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
                for (int k = 0; k < listLensnumber1.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y);
                    var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1050);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
@@ -594,6 +644,7 @@
                    listLensnumber1[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
                    listLensnumber1[k].R = distance;
                    if (distance <= runparam.MidLens1R1)
                    {
                        listLensnumber1[k].location = "镜头";
@@ -612,13 +663,14 @@
                var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
                for (int k = 0; k < listLensnumber2.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y);
                    var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1050);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber2[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber2[k].X, listLensnumber2[k].Y);
                    listLensnumber2[k].R = distance;
                    if (distance <= runparam.MidLens2R1)
                    {
                        listLensnumber2[k].location = "镜头";
@@ -636,13 +688,14 @@
                var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
                for (int k = 0; k < listLensnumber3.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y);
                    var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1050);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber3[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber3[k].X, listLensnumber3[k].Y);
                    listLensnumber3[k].R = distance;
                    if (distance <= runparam.MidLens3R1)
                    {
                        listLensnumber3[k].location = "镜头";
@@ -660,13 +713,14 @@
                var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
                for (int k = 0; k < listLensnumber4.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y);
                    var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1050);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber4[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber4[k].X, listLensnumber4[k].Y);
                    listLensnumber4[k].R = distance;
                    if (distance <= runparam.MidLens4R1)
                    {
                        listLensnumber4[k].location = "镜头";
@@ -685,7 +739,7 @@
            }
            return list;
        }
        //获取中框角度和位置
        //获取中框刮白角度和位置
        private List<ResultData> GetWhiteLocation(List<ResultData> list)
        {
            var group = list.GroupBy(a => a.TimeTip);
@@ -695,7 +749,7 @@
                var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
                for (int k = 0; k < listLensnumber1.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y);
                    var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1050);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
@@ -703,6 +757,7 @@
                    listLensnumber1[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
                    listLensnumber1[k].R = distance;
                    if (distance <= runparam.MidLens1R1)
                    {
                        listLensnumber1[k].location = "镜头";
@@ -725,13 +780,14 @@
                var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
                for (int k = 0; k < listLensnumber2.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y);
                    var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1050);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber2[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber2[k].X, listLensnumber2[k].Y);
                    listLensnumber2[k].R = distance;
                    if (distance <= runparam.MidLens2R1)
                    {
                        listLensnumber2[k].location = "镜头";
@@ -753,13 +809,14 @@
                var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
                for (int k = 0; k < listLensnumber3.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y);
                    var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1050);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber3[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber3[k].X, listLensnumber3[k].Y);
                    listLensnumber3[k].R = distance;
                    if (distance <= runparam.MidLens3R1)
                    {
                        listLensnumber3[k].location = "镜头";
@@ -781,13 +838,14 @@
                var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
                for (int k = 0; k < listLensnumber4.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y);
                    var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1050);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber4[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber4[k].X, listLensnumber4[k].Y);
                    listLensnumber4[k].R = distance;
                    if (distance <= runparam.MidLens4R1)
                    {
                        listLensnumber4[k].location = "镜头";
@@ -820,14 +878,15 @@
                var listLensnumber1 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 1);
                for (int k = 0; k < listLensnumber1.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y);
                    var lenAngle = GetAngle(listLensnumber1[k].X, listLensnumber1[k].Y,1350);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber1[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber1[k].X, listLensnumber1[k].Y);
                    var distance = GetDistance(1350, 1350, listLensnumber1[k].X, listLensnumber1[k].Y);
                    listLensnumber1[k].R = distance;
                    if (distance <= runparam.BkLens1R1)
                    {
                        listLensnumber1[k].location = "可视区";
@@ -843,13 +902,14 @@
                var listLensnumber2 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 2);
                for (int k = 0; k < listLensnumber2.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y);
                    var lenAngle = GetAngle(listLensnumber2[k].X, listLensnumber2[k].Y,1350);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber2[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber2[k].X, listLensnumber2[k].Y);
                    var distance = GetDistance(1350, 1350, listLensnumber2[k].X, listLensnumber2[k].Y);
                    listLensnumber2[k].R = distance;
                    if (distance <= runparam.BkLens2R1)
                    {
                        listLensnumber2[k].location = "可视区";
@@ -863,13 +923,14 @@
                var listLensnumber3 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 3);
                for (int k = 0; k < listLensnumber3.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y);
                    var lenAngle = GetAngle(listLensnumber3[k].X, listLensnumber3[k].Y,1350);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber3[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber3[k].X, listLensnumber3[k].Y);
                    var distance = GetDistance(1350, 1350, listLensnumber3[k].X, listLensnumber3[k].Y);
                    listLensnumber3[k].R = distance;
                    if (distance <= runparam.BkLens3R1)
                    {
                        listLensnumber3[k].location = "可视区";
@@ -884,13 +945,14 @@
                var listLensnumber4 = list.FindAll(a => a.TimeTip == item.Key && a.Lensnumber == 4);
                for (int k = 0; k < listLensnumber4.Count; k++)
                {
                    var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y);
                    var lenAngle = GetAngle(listLensnumber4[k].X, listLensnumber4[k].Y,1350);
                    if (lenAngle < 0)
                    {
                        lenAngle = 360 + lenAngle;
                    }
                    listLensnumber4[k].angle = lenAngle;
                    var distance = GetDistance(1050, 1050, listLensnumber4[k].X, listLensnumber4[k].Y);
                    var distance = GetDistance(1350, 1350, listLensnumber4[k].X, listLensnumber4[k].Y);
                    listLensnumber4[k].R = distance;
                    if (distance <= runparam.BkLens4R1)
                    {
                        listLensnumber4[k].location = "可视区";
@@ -961,9 +1023,9 @@
        {
            return Math.Sqrt(Math.Pow((x2 - x1), 2) + Math.Pow((y2 - y1), 2));
        }
        private double GetAngle(double x1, double y1)
        private double GetAngle(double x1, double y1,double size)
        {
            return Math.Atan2((y1 - 1050), (x1 - 1050)) * (180 / Math.PI);
            return Math.Atan2((y1 - size), (x1 - size)) * (180 / Math.PI);
        }
    }