From b60d2759b196fcf5e12ac469574615e938f586d4 Mon Sep 17 00:00:00 2001
From: "xhm\\HP" <1173131411@qq.com>
Date: Mon, 24 Mar 2025 19:03:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE=E8=B7=AF?=
 =?UTF-8?q?=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DH.Commons/Base/DetectionConfig.cs | 12 +++++++++++-
 DHSoftware/MainWindow.cs           |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/DH.Commons/Base/DetectionConfig.cs b/DH.Commons/Base/DetectionConfig.cs
index 681f76e..f5ae3e6 100644
--- a/DH.Commons/Base/DetectionConfig.cs
+++ b/DH.Commons/Base/DetectionConfig.cs
@@ -752,7 +752,17 @@ namespace DH.Commons.Base
         [Description("中处理-模型标签路径")]
         public string In_lable_path
         {
-            get => _in_lable_path;
+            get
+            {
+                if (string.IsNullOrEmpty(ModelPath) || string.IsNullOrWhiteSpace(ModelPath))
+                {
+                    return string.Empty;
+                }
+
+                string dir = Path.GetDirectoryName(ModelPath);
+                string file = $"{Path.GetFileNameWithoutExtension(ModelPath)}.txt";
+                return Path.Combine(dir, file);
+            }
             set
             {
                 if (_in_lable_path == value) return;
diff --git a/DHSoftware/MainWindow.cs b/DHSoftware/MainWindow.cs
index 49071cf..f9933ca 100644
--- a/DHSoftware/MainWindow.cs
+++ b/DHSoftware/MainWindow.cs
@@ -453,7 +453,7 @@ namespace DHSoftware
                         cam.CameraIP = cameraBase.CameraIP;
                         cam.IsEnabled = cameraBase.IsEnabled;
                         Cameras.Add(cam);
-                        cam.CameraConnect();
+                        //cam.CameraConnect();
                         cam.OnHImageOutput += OnCameraHImageOutput;
                     }
                     else if(cameraBase.CamType == EnumCamType.海康hik)
@@ -483,7 +483,7 @@ namespace DHSoftware
                         PLC.PLCName = plcBase.PLCName;
                         PLC.PLCItemList=plcBase.PLCItemList;
                         PLC.Port= plcBase.Port;
-                        PLC.PLCConnect();
+                       // PLC.PLCConnect();
                     }
                 }