1.修改背板尺寸，合并后输出最大尺寸。

Administrator

2021-03-17 c44414d187c08d6ab9f1f86588c237432eaa0ee4

 P066.Data/Form1.cs

@@ -296,8 +296,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 +311,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 +392,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 +404,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 +419,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 +472,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);
            }
@@ -586,7 +630,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 +638,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 +657,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 +682,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 +707,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 = "镜头";
@@ -695,7 +743,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 +751,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 +774,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 +803,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 +832,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 +872,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 +896,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 +917,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 +939,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 +1017,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);
        }

    }