1.新增划伤、脏污功能未完成。

Administrator

2021-03-18 2b2050ed6272af429480652974a128234eef29b4

 P066.Data/Form1.cs

@@ -75,6 +75,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 +85,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>();
@@ -95,6 +97,9 @@
            dataListSum22.Sort();
            #endregion
           
            //如果需要合并表格就执行
            if (fileInfo1.Count== fileInfo2.Count)
            {
            for (int i = 0; i < fileInfo1.Count; i++)
            {
                CompareFile(fileInfo1[i], fileInfo2[i], dataListSum22, out DataListMerge);
@@ -189,6 +194,19 @@

                }
            }
            }

            //不需要合并表格
            else if(fileInfo1.Count>0&& fileInfo2.Count==0)
            {
                for (int i = 0; i < fileInfo1.Count; i++)
                {
                    var allLines = File.ReadAllLines(fileInfo1[i].FullName, Encoding.Default);
                    var list = GetData(allLines,GetDefactType(fileInfo1[i]));      /*CompareFile(fileInfo1[i], fileInfo2[i],dataListSum22)*/

                }
            }



            #region//将设备判断结果输出到CSV报表中
@@ -257,13 +275,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)
@@ -752,13 +775,40 @@
            return Math.Atan2((y1 - size), (x1 - size)) * (180 / Math.PI);
        }

        private List<ResultData> GetData(string[] allLines)

        //获取文件名称并确定缺陷类型
        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 = "";
            for (int i = 1; i < allLines.Length; i++)
            {

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


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


                if (data[6] == "-")
                {
@@ -793,15 +847,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 +895,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]),