From a9bc7819f4f7e66159a93e955944728c25ba3e53 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期三, 07 一月 2026 14:10:11 +0800
Subject: [PATCH] 优化相机管理和界面布局 - 在 `CreateCameraForm.cs` 中添加对 `LBCameras` 的引用，并修复相机创建逻辑。 - 调整 `VisionForm.Designer.cs` 和 `2DCameraForm.Designer.cs` 中多个控件的大小和位置，改善界面布局。 - 在 `VisionForm.cs` 中添加对 `LBCameras` 的引用以支持新相机类型。 - 注释掉 `PHM6000Sensor.cs` 和 `PHM6000Profiler.cs` 中与相机信息获取相关的 P/Invoke 方法。 - 重构 `LBCamera.cs`，添加新的相机初始化和参数设置逻辑，确保与 PHM6000 SDK 的兼容性。 - 移除 `PHM6000Camera.cs` 中与 `PHM6000Camera` 相关的代码，简化相机管理逻辑。 Merge branch 'master' of http://lanpucloud.cn:1111/r/~zhengyabo/LB_TyreAppearanceInspectionSoftware
---
LB_SmartVision/ProcessRun/ProcessRunBll.cs | 26 ++++++++++++++++----------
1 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/LB_SmartVision/ProcessRun/ProcessRunBll.cs b/LB_SmartVision/ProcessRun/ProcessRunBll.cs
index 0555a01..d2ba837 100644
--- a/LB_SmartVision/ProcessRun/ProcessRunBll.cs
+++ b/LB_SmartVision/ProcessRun/ProcessRunBll.cs
@@ -24,10 +24,13 @@
public static string Node2ToolClassName(string NodeName)
{
+
foreach (var item in IProcess.dicProcesses)
{
if (NodeName.StartsWith(item.Key))
+ {
return item.Value.ToString();
+ }
}
return string.Empty;
@@ -41,7 +44,7 @@
/// <summary>
/// 杩愯鏍囪
/// </summary>
- public bool bPruning
+ public bool bRuning
{
set
{
@@ -903,9 +906,8 @@
/// <returns></returns>
public bool Run()
{
- bPruning = true;
+ bRuning = true;
bCompleted = false;
-
DateTime StartTime = DateTime.Now;
try
{
@@ -921,30 +923,34 @@
Result = false;
Msg = string.Format("杩愯鍙戦�佷簡鎰忓{0}", ex.Message.Trim());
}
-
RunTime = (DateTime.Now - StartTime).TotalMilliseconds;
-
- bPruning = false;
+ bRuning = false;
bCompleted = true;
-
if (Result)
{
total_OK++;
Msg = "杩愯鎴愬姛";
}
else
+ {
total_NG++;
-
+ }
if (IProcess.dicGlobalVars.ContainsKey($"{Name}.Result"))
+ {
IProcess.dicGlobalVars[$"{Name}.Result"] = Result;
+ }
else
+ {
IProcess.dicGlobalVars.TryAdd($"{Name}.Result", Result);
-
+ }
if (IProcess.dicGlobalVars.ContainsKey($"{Name}.Msg"))
+ {
IProcess.dicGlobalVars[$"{Name}.Msg"] = Msg;
+ }
else
+ {
IProcess.dicGlobalVars.TryAdd($"{Name}.Msg", Msg);
-
+ }
// 鎵嬪姩瑙﹀彂鍨冨溇鍥炴敹
GC.Collect();
return Result;
--
Gitblit v1.9.3