From 9519d0962fb2772cce85653f53d140b8aa657ab2 Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期一, 13 七月 2020 09:40:17 +0800
Subject: [PATCH] 数据库迁移
---
src/Bro.M071.Process/M071Models.cs | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/src/Bro.M071.Process/M071Models.cs b/src/Bro.M071.Process/M071Models.cs
index f2c588f..beb5008 100644
--- a/src/Bro.M071.Process/M071Models.cs
+++ b/src/Bro.M071.Process/M071Models.cs
@@ -178,7 +178,22 @@
public string GetDisplayText()
{
- return $"{AliasName}";
+ 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()
@@ -376,7 +391,9 @@
{
if (valuePairs == null || valuePairs.Count == 0)
{
- IsDone = false;
+ IsDone = false;
+ PropertyChanged?.Invoke(this, new PropertyChangedEventArgs("IsDone"));
+ return;
}
foreach (KeyValuePair<string, double> pair in valuePairs)
--
Gitblit v1.8.0