From ef75346ebe57d56cec0c33ad5abd8b2aa218da95 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期六, 18 四月 2026 12:29:32 +0800
Subject: [PATCH] 修改相机运动轴参数读取配置
---
LB_SmartVision/GlobalVar.cs | 36 +++++++++++++++++++++++++++++-------
1 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/LB_SmartVision/GlobalVar.cs b/LB_SmartVision/GlobalVar.cs
index e2ea35c..8709dc9 100644
--- a/LB_SmartVision/GlobalVar.cs
+++ b/LB_SmartVision/GlobalVar.cs
@@ -3,9 +3,11 @@
using LB_SmartVision.Forms.Pages.SettingPage;
using LB_SmartVision.ProcessRun;
using LB_SmartVision.Tool;
+using LB_SmartVisionCameraDevice.PHM6000;
using LB_VisionProcesses.BarcodeReaders;
using LB_VisionProcesses.Cameras;
using LB_VisionProcesses.Communicators;
+using LB_VisionProcesses.Communicators.SiemensS7;
using System.Collections.Concurrent;
namespace LB_SmartVision
@@ -47,8 +49,10 @@
public static string AllSerialPortPath
=> GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName + "\\A_SerialPort.json";
-
-
+ /// <summary>
+ /// 褰撳墠閫氳
+ /// </summary>
+ public static string currentCommunicators { get; set; } = string.Empty;
/// <summary>
/// 娴佺▼闆嗗悎(Key:娴佺▼鍚嶏紝Value:杩愯姝ラ闆嗗悎)
/// </summary>
@@ -71,18 +75,29 @@
/// <summary>
- /// 杩愬姩鎺ф暟鎹埗闆嗗悎 Key:浜у搧鍚嶇О锛孷alue: SN,RecordMotionControlData
+ /// 杩愬姩鎺ф暟鎹埗闆嗗悎 Key:浜у搧鍚嶇О锛孷alue: SN,PlcConfig
/// </summary>
- public static Dictionary<string, Dictionary<string, PlcDataItem>> dicMPlcData { get; set; } = new Dictionary<string, Dictionary<string, PlcDataItem>>();
+ public static Dictionary<string, Dictionary<string, PlcConfig>> dicMPlcDatas { get; set; } = new Dictionary<string, Dictionary<string, PlcConfig>>();
+
+ public static string allMPlcDatasPath
+ => GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName + "\\A_MPlcDatas.json";//
public static string allMPlcDataPath
- => GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName + "\\A_MPlcDatas.json";
+ => GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName + "\\MotionControl";
+
+ public static Dictionary<string, PlcConfig> allPlcSettings { get; set; } = new Dictionary<string, PlcConfig>();
+
+ public static string allPlcSettingPath
+ => GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName/*+ "\\A_PlcSetting.json"*/;
+
+ public static string allPlcSettingsPath
+ => GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName + "\\A_PlcSettings.json";
/// <summary>
- /// 杩愬姩鎺ф暟鎹埗闆嗗悎 Key:浜у搧鍚嶇О锛孷alue: SN,RecordMotionControlData
+ /// 杩愬姩鎺ф暟鎹埗闆嗗悎 Key:浜у搧鍚嶇О锛孷alue: SN,PlcConfig
/// </summary>
- public static Dictionary<string, Dictionary<string, RecordMotionControlData>> dicMotionControlData { get; set; } = new Dictionary<string, Dictionary<string, RecordMotionControlData>>();
+ public static Dictionary<string, Dictionary<string, PlcConfig>> dicMotionControlData { get; set; } = new Dictionary<string, Dictionary<string, PlcConfig>>();
public static string allMotionControlDataPath
=> GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName + "\\A_MotionControlDatas.json";
@@ -136,6 +151,13 @@
=> GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName + "\\A_AllCsv.json";
#endregion
+ public static ConcurrentDictionary<string, PHM6000SensorConfig> allLBCameras = new ConcurrentDictionary<string, PHM6000SensorConfig>();
+
+ public static string allCamerasLBPath
+ => GlobalVar.strApplicationPath + "鎵�鏈変骇鍝乗\" + GlobalVar.strProductName + "\\LBCameraSetttings.json";
+
+
+
/// <summary>
/// 杞欢璺緞
/// </summary>
--
Gitblit v1.9.3