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(); } }