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_VisionProcesses/Communicators/CommunicatorForm.cs | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/LB_VisionProcesses/Communicators/CommunicatorForm.cs b/LB_VisionProcesses/Communicators/CommunicatorForm.cs
index ca5526d..c5298b1 100644
--- a/LB_VisionProcesses/Communicators/CommunicatorForm.cs
+++ b/LB_VisionProcesses/Communicators/CommunicatorForm.cs
@@ -1,4 +1,7 @@
-锘縰sing System;
+锘縰sing LB_VisionProcesses.Communicators.SiemensS7;
+using LB_VisionProcesses.Communicators.TCom;
+using RJCP.IO.Ports;
+using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.ComponentModel;
@@ -11,8 +14,6 @@
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
-using LB_VisionProcesses.Communicators.TCom;
-using RJCP.IO.Ports;
namespace LB_VisionProcesses.Communicators
{
@@ -135,6 +136,20 @@
txtIP.Text = communicator.CommunicatorConnections["鍦板潃"].ToString();
txtPort.Text = communicator.CommunicatorConnections["绔彛"].ToString();
}
+ else if (communicator is SiemensLBS7)
+ {
+ btnSend.Enabled = communicator.bConnected;
+ btnRuleSend.Enabled = communicator.bConnected;
+
+ cmbIP.Visible = false;
+ txtIP.Visible = true;
+
+ lblIP.Text = "IP";
+ lblIP.Text = "妲�";
+
+ txtIP.Text = communicator.CommunicatorConnections["鍦板潃"].ToString();
+ txtPort.Text = communicator.CommunicatorConnections["妲�"].ToString();
+ }
else
{
btnSend.Enabled = communicator.bConnected;
--
Gitblit v1.9.3