1.新增程序自动区分文件夹的上、下。

Administrator

2021-03-18 14c9a820cec697c024b2058ba1c63db2f5f84a5e

 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))
                {
@@ -505,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;
@@ -542,6 +547,7 @@
                else
                {
                    defectType = "白点";
                    Ptr = data[10];
                }

                if (data[6] == "-")
@@ -583,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()
                {
@@ -733,7 +739,7 @@
            }
            return list;
        }
        //获取中框角度和位置
        //获取中框刮白角度和位置
        private List<ResultData> GetWhiteLocation(List<ResultData> list)
        {
            var group = list.GroupBy(a => a.TimeTip);