From 365ba3913b3b59e0149f85dc835818e45a979488 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期三, 31 十二月 2025 13:05:06 +0800
Subject: [PATCH] 修复一部分工具图像转换问题以及内存释放问题。以及合并史工提交的相机和用户设计模块
---
LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs b/LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs
index 1d9acea..275f5a4 100644
--- a/LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs
+++ b/LB_SmartVision/Forms/Pages/CameraPage/CamerasEditPage.cs
@@ -137,16 +137,11 @@
if (name != Name)
continue;
- RemoveFlowEvent(flow);
- uiFlowLayoutPanel1.Controls.Remove(uiFlowLayoutPanel1.Controls[i]);
- if (GlobalVar.dicCameras.TryRemove(name, out BaseCamera BaseCamera))
+ if (GlobalVar.dicCameras.ContainsKey(name))
{
- BaseCamera.Dispose();
- LogInfo?.Invoke(string.Format("绉婚櫎鐩告満[{0}]", name), LogInfoType.INFO);
+ MotionControlPage.MotionControlForm cameraForm = new MotionControlPage.MotionControlForm(GlobalVar.dicCameras[name]);
+ cameraForm.Show();
}
- else
- LogInfo?.Invoke(string.Format("绉婚櫎鐩告満[{0}]澶辫触", name), LogInfoType.ERROR);
-
}
}
--
Gitblit v1.9.3