This commit is contained in:
atvstdla
2025-09-30 17:35:11 +09:00
parent 5a2eeed3c4
commit 1273ca8236
37 changed files with 1333 additions and 1033 deletions

View File

@@ -15,7 +15,7 @@ namespace Project.Class
public class VisionData : INotifyPropertyChanged
{
public int RetryLoader { get; set; }
public List<string> bcdMessage { get; set; }
public Dictionary<int,string> bcdMessage { get; set; }
public Boolean LightOn { get; set; }
public DateTime STime; //비젼시작시간
public DateTime ETime; //비젼종료시간
@@ -97,6 +97,15 @@ namespace Project.Class
return true;
}
//실제사용한 데이터 우선한다.
bcddata = bcdCanList.OrderByDescending(t=>t.Value.RefExApply).FirstOrDefault();
if (bcddata.Value != null && bcddata.Value.RefExApply > 0)
{
bcd = bcddata.Value;
msg = $"Used Data({bcddata.Value.RefExApply})";
return true;
}
//QR코드를 우선으로 사용 - return 릴은 적용하지 안게한다.
//RQ코드가 적용되지 않게한다 210824
bcddata = bcdCanList.Where(t => t.Value.barcodeSymbol == "1" && t.Value.isNewLen15 == false && t.Value.Data.EndsWith(";;;") == false && t.Value.Data.StartsWith("RQ") == false).FirstOrDefault();
@@ -609,7 +618,7 @@ namespace Project.Class
ApplyOffset = false;
var baktime = new DateTime(1982, 11, 23);
if (timeBackup) baktime = this.STime;
bcdMessage = new List<string>();
bcdMessage = new Dictionary<int, string>();
PositionAngle = 0;
HASHEADER = false;
@@ -708,9 +717,9 @@ namespace Project.Class
public void CopyTo(ref VisionData obj)
{
//바코드메세지 복사
obj.bcdMessage = new List<string>();
obj.bcdMessage = new Dictionary<int, string>();
foreach (var item in this.bcdMessage)
obj.bcdMessage.Add(item);
obj.bcdMessage.Add(item.Key, item.Value);
obj.ApplyOffset = this.ApplyOffset;
obj.ConfirmAuto = this.ConfirmAuto;
@@ -839,9 +848,9 @@ namespace Project.Class
public void UpdateTo(ref VisionData obj)
{
//바코드메세지 복사
obj.bcdMessage = new List<string>();
obj.bcdMessage = new Dictionary<int, string>();
foreach (var item in this.bcdMessage)
obj.bcdMessage.Add(item);
obj.bcdMessage.Add(item.Key, item.Value);
obj.ApplyOffset = this.ApplyOffset;
obj.ConfirmAuto = this.ConfirmAuto;