From 140bb4a37bff593217f0e261f52603bbd5afc7a1 Mon Sep 17 00:00:00 2001
From: Jack.Peng <jack.peng@broconcentric.com>
Date: 星期日, 09 五月 2021 22:15:43 +0800
Subject: [PATCH] 1.调整一次读取并处理。（未完成）
---
P066.Data/ReadFile.cs | 104 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 73 insertions(+), 31 deletions(-)
diff --git a/P066.Data/ReadFile.cs b/P066.Data/ReadFile.cs
index cbc181f..85c0fa6 100644
--- a/P066.Data/ReadFile.cs
+++ b/P066.Data/ReadFile.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -19,6 +20,9 @@
for (int i = 1; i < allLines.Length; i++)
{
var data = allLines[i].Split(',');
+
+ if (data[3]!="OK") //鍙鍙朜G淇℃伅
+ {
if (data[0] == "")
{
data[0] = nametemp;
@@ -34,6 +38,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName=data[0].Split('-')[2].Substring(0,9)+"鐧界偣",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -58,6 +64,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鐧界偣",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -65,8 +73,8 @@
}); ; ;
}
}
-
- return dataList;
+ }
+ return dataList;
}
#endregion
@@ -77,9 +85,11 @@
var dataList = new List<ResultData>();
var nametemp = allLines[1].Split(',')[0];
var resulttemp = allLines[1].Split(',')[1];
- for (int i = 1; i < allLines.Length; i++)
+ for (int i = 1; i < allLines.Length; i++)
+ {
+ var data = allLines[i].Split(',');
+ if (data[3] != "OK") //鍙鍙朜G淇℃伅
{
- var data = allLines[i].Split(',');
if (data[0] == "")
{
data[0] = nametemp;
@@ -94,6 +104,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒櫧",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -104,7 +116,7 @@
X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
DefectType = data[3] == "OK" ? "OK" : "鍒櫧",
- PostTreatmentResults = "鍒櫧",
+ PostTreatmentResults = "",
}); ; ;
nametemp = data[0];
@@ -117,15 +129,18 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒櫧",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
- PostTreatmentResults = "鍒櫧",
+ PostTreatmentResults = "",
}); ; ;
}
}
+ }
return dataList;
}
@@ -137,9 +152,11 @@
var dataList = new List<ResultData>();
var nametemp = allLines[1].Split(',')[0];
var resulttemp = allLines[1].Split(',')[1];
- for (int i = 1; i < allLines.Length; i++)
+ for (int i = 1; i < allLines.Length; i++)
+ {
+ var data = allLines[i].Split(',');
+ if (data[3] != "OK") //鍙鍙朜G淇℃伅
{
- var data = allLines[i].Split(',');
if (data[0] == "")
{
data[0] = nametemp;
@@ -148,26 +165,28 @@
try
{
- if (data[1]!="OK")
- {
- dataList.Add(new ResultData()
+ if (data[1] != "OK")
{
- TimeTip = data[0].Split('-')[0],
- ImageFileName = data[0],
- JudgmentResult = "NG",
- Result = data[3] == "OK",
- Probability = Convert.ToDouble(data[4]),
- Uncertainty = Convert.ToDouble(data[5]),
- Height = Convert.ToDouble(data[6]),
- Width = Convert.ToDouble(data[7]),
- X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
- Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
- DefectType = data[3],
- PostTreatmentResults = "鍒掍激",
- }); ; ;
- nametemp = data[0];
- resulttemp = data[1];
- }
+ dataList.Add(new ResultData()
+ {
+ TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒掍激",
+ ImageFileName = data[0],
+ JudgmentResult = "NG",
+ Result = data[3] == "OK",
+ Probability = Convert.ToDouble(data[4]),
+ Uncertainty = Convert.ToDouble(data[5]),
+ Height = Convert.ToDouble(data[6]),
+ Width = Convert.ToDouble(data[7]),
+ X = Convert.ToDouble(data[8].Replace("#", "").Replace("-", "")),
+ Y = Convert.ToDouble(data[9].Replace("#", "").Replace("-", "")),
+ DefectType = data[3],
+ PostTreatmentResults = "",
+ }); ; ;
+ nametemp = data[0];
+ resulttemp = data[1];
+ }
}
catch (Exception)
{
@@ -175,6 +194,8 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "鍒掍激",
ImageFileName = data[0],
JudgmentResult = data[1] == "OK" ? "OK" : "NG",
Result = data[3] == "OK",
@@ -184,6 +205,7 @@
}
+ }
return dataList;
}
@@ -201,21 +223,40 @@
dataList.Add(new ResultData()
{
TimeTip = data[0].Split('-')[0],
+ Lensnumber = Convert.ToInt32(data[0].Split('-')[2].Substring(6, 1)),
+ FileName = data[0].Split('-')[2].Substring(0, 9) + "闀�鑶滅牬鎹�",
ImageFileName = data[0],
JudgmentResult = "NG",
DefectType = data[1],
- PostTreatmentResults = "闀�鑶滅牬鎹�",
+ PostTreatmentResults = "",
}); ; ;
}
}
return dataList;
}
- #endregion
+ #endregion
+ #region 璇诲彇涓�涓椂闂存埑
+ public List<string>TimeStamp(FileInfo fileInfo)
+ {
+ var allLines = File.ReadAllLines(fileInfo.FullName, Encoding.Default);
+ var dataList = new List<string>();
+ for (int i = 1; i < allLines.Length; i++)
+ {
+ var data = allLines[i].Split(',');
+ if (data[0].Length>0)
+ {
+ dataList.Add(data[0].Split('-')[0]);
+ }
+
- ////灏嗗湴7銆�8鍒椾腑閫夋渶澶у儚绱犵偣
- private string SelectMaxPiont(string Data)
+ }
+ return dataList;
+ }
+ #endregion
+ ////灏嗗湴7銆�8鍒椾腑閫夋渶澶у儚绱犵偣
+ private string SelectMaxPiont(string Data)
{
var data = Data.Split('#').ToList();
data.Remove("");
@@ -252,6 +293,7 @@
public double R = 0;
public string DefectType = "";
public string PostTreatmentResults = "";
+ public string FileName = "";
}
--
Gitblit v1.8.0