From 0dfbcfad8bbbeae5218293d59aba851fd8e65a90 Mon Sep 17 00:00:00 2001
From: wells <123>
Date: 星期六, 11 七月 2020 12:25:35 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.M071.Process/M071Models.cs | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index b00d4d8..5ccaad2 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -137,13 +137,13 @@
get => key;
set
{
- AlignName = key = value;
+ AliasName = key = value;
}
}
[Category("閿悕閰嶇疆")]
[Description("鍒悕")]
- public string AlignName { get; set; }
+ public string AliasName { get; set; }
[Category("鍚敤璁剧疆")]
[Description("true锛氬惎鐢� false锛氱鐢�")]
@@ -178,7 +178,22 @@
public string GetDisplayText()
{
- return $"{AlignName}";
+ string snapShot = "鏈寚瀹�";
+
+ using (var scope = GlobalVar.Container.BeginLifetimeScope())
+ {
+ var config = scope.Resolve<IProcessConfig>();
+ if (config != null)
+ {
+ var snapshotPoint = (config as M071Config).SnapshotPointCollection.FirstOrDefault(u => u.Id == SnapshotPointId);
+ if (snapshotPoint != null)
+ {
+ snapShot = snapshotPoint.Name;
+ }
+ }
+ }
+
+ return $"{AliasName}-{snapShot}-{ImageSeq}";
}
public List<string> GetHalconToolPathList()
@@ -204,11 +219,16 @@
public class ProductionMeasurement : INotifyPropertyChanged, IDisposable
{
public string Barcode;
+ public string PResult;
public List<MeasurementUnit> Measurements = new List<MeasurementUnit>();
public List<IShapeElement> ElementList = new List<IShapeElement>();
+ public DateTime? StartTime = null;
+
+ public DateTime? EndTime = null;
+
public event PropertyChangedEventHandler PropertyChanged;
public void Dispose()
--
Gitblit v1.8.0