From 452d868c534280ec82aada44d96b47042e694e9e Mon Sep 17 00:00:00 2001
From: xcd <834800634@qq.com>
Date: 星期三, 08 七月 2020 16:54:21 +0800
Subject: [PATCH] 载入背景图片时适应屏幕尺寸
---
src/Bro.M071.Process/M071Process.cs | 73 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/src/Bro.M071.Process/M071Process.cs b/src/Bro.M071.Process/M071Process.cs
index 12b9601..8f08ba9 100644
--- a/src/Bro.M071.Process/M071Process.cs
+++ b/src/Bro.M071.Process/M071Process.cs
@@ -47,14 +47,21 @@
base.Open();
+ SwitchBeep(false);
+ SwitchLightGreen(false);
+ SwitchLightRed(false);
+ SwitchLightYellow(false);
+
Reset(null, null, null);
FullReset(null);
}
private void InitialSetting()
{
- //鏁版嵁搴撹縼绉绘鏌�
- DatabaseInitialize.Initialize();
+ ////鏁版嵁搴撹縼绉绘鏌�
+ //DatabaseInitialize.Initialize();
+
+ MotionCardSettingCheck();
Config.SnapshotPointCollection.ForEach(u =>
{
@@ -71,21 +78,21 @@
var snapshotPoint = Config.SnapshotPointCollection.FirstOrDefault(s => s.Id == u.SnapshotPointId && s.IsEnabled);
if (snapshotPoint == null)
- throw new ProcessException($"{u.AlignName}鏈缃彲鐢ㄦ媿鐓х偣浣�");
+ throw new ProcessException($"{u.AliasName}鏈缃彲鐢ㄦ媿鐓х偣浣�");
if (u.ImageSeq < 1)
- throw new ProcessException($"{u.AlignName}鍥剧墖搴忓彿灏忎簬1");
+ throw new ProcessException($"{u.AliasName}鍥剧墖搴忓彿灏忎簬1");
var algo = Config.KeyAlgorithemCollection.FirstOrDefault(a => a.Id == u.KeyAlgorithemId);
if (algo == null)
- throw new ProcessException($"{u.AlignName}鏈缃娴嬬畻娉�");
+ throw new ProcessException($"{u.AliasName}鏈缃娴嬬畻娉�");
u.KeyAlgorithemPath = algo.AlgorithemPath;
- LoadHalconTool(u.KeyAlgorithemPath, u.AlignName);
+ LoadHalconTool(u.KeyAlgorithemPath, u.AliasName);
var resultSet = Config.KeyResultCollection.FirstOrDefault(r => r.Id == u.KeyResultId);
if (resultSet == null)
- throw new ProcessException($"{u.AlignName}鏈缃娴嬬粨鏋滈厤缃�");
+ throw new ProcessException($"{u.AliasName}鏈缃娴嬬粨鏋滈厤缃�");
u.KeyResultList = new List<string>(resultSet.Results);
});
@@ -353,28 +360,28 @@
{
return;
}
-
- pMeasure.EndTime = DateTime.Now;
- bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
- OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
- OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);
-
- LogAsync(DateTime.Now, $"{pMeasure.Barcode} 妫�娴嬪畬鎴愶紝缁撴灉 {(pResult ? "OK" : "NG")}", "");
-
- if (MachineState == MachineState.Running)
- MachineState = MachineState.Ready;
-
- //MES杈撳嚭 todo
-
- //Excel鎶ヨ〃杈撳嚭 todo
-
- //鏁版嵁搴撲繚瀛� todo
-
- SaveWholeImage(pMeasure);
-
- productionList.RemoveAll(p => p.Barcode == pMeasure.Barcode);
- pMeasure.Dispose();
}
+
+ pMeasure.EndTime = DateTime.Now;
+ bool pResult = pMeasure.Measurements.All(u => u.Spec.MeasureResult == true);
+ OnUpdateResult?.Invoke(DateTime.Now, pResult ? 1 : 0);
+ OnUpdateCT?.Invoke((float)(pMeasure.EndTime.Value - pMeasure.StartTime.Value).TotalSeconds);
+
+ LogAsync(DateTime.Now, $"{pMeasure.Barcode} 妫�娴嬪畬鎴愶紝缁撴灉 {(pResult ? "OK" : "NG")}", "");
+
+ if (MachineState == MachineState.Running)
+ MachineState = MachineState.Ready;
+
+ //MES杈撳嚭 todo
+
+ //Excel鎶ヨ〃杈撳嚭 todo
+
+ //鏁版嵁搴撲繚瀛� todo
+
+ SaveWholeImage(pMeasure);
+
+ productionList.RemoveAll(p => p.Barcode == pMeasure.Barcode);
+ pMeasure.Dispose();
}
}
@@ -504,7 +511,7 @@
var excludeKeys = keys.Where(u => u.ImageSeq > count).ToList();
if (excludeKeys.Count > 0)
{
- LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AlignName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
+ LogAsync(DateTime.Now, $"{string.Join(" ", excludeKeys.Select(u => u.AliasName))}鏈湪鍥剧墖鑾峰彇搴忓垪涓�", "");
keyBindCollection.Where(k => excludeKeys.Any(u => u.Key == k.Key)).ToList().ForEach(k =>
{
k.FillKeyValues(null);
@@ -521,24 +528,24 @@
var keyBindList = keyBindCollection.Where(u => u.Key == k.Key).ToList();
- string keyToolKey = k.AlignName + "|" + k.KeyAlgorithemPath;
+ string keyToolKey = k.AliasName + "|" + k.KeyAlgorithemPath;
if (!_halconToolDict.ContainsKey(keyToolKey))
{
- LogAsync(DateTime.Now, $"{k.AlignName}妫�娴嬬畻娉曟湭鍒濆鍖�", "");
+ LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曟湭鍒濆鍖�", "");
}
else
{
_halconToolDict[keyToolKey].InputImageDic["INPUT_Image"] = image;
if (!_halconToolDict[keyToolKey].RunProcedure(out string error))
{
- LogAsync(DateTime.Now, $"{k.AlignName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
+ LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬畻娉曞紓甯革紝{error}", "");
}
else
{
var results = _halconToolDict[keyToolKey].GetResultTuple("OUTPUT_Results").HTupleToDouble();
if (results.Count == 0 || results.Any(u => u < 0))
{
- LogAsync(DateTime.Now, $"{k.AlignName}妫�娴嬬粨鏋滃紓甯�", "");
+ LogAsync(DateTime.Now, $"{k.AliasName}妫�娴嬬粨鏋滃紓甯�", "");
}
else
{
--
Gitblit v1.8.0