xiaohuimin/DHDHSoftware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

界面优化

Browse Source
This commit is contained in:
xhm\HP
2025-03-15 09:47:09 +08:00
parent 9a330c01f8
commit ca6476b87c
29 changed files with 2497 additions and 1350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
DHSoftware/MainWindow.cs
View File

@ -62,6 +62,7 @@ namespace DHSoftware
UserConfigFrm userControlFrm = new UserConfigFrm();
// tabImgDisplay.Pages.Clear();
// tabPage2.Controls.Clear();
userControlFrm.Window = this;
userControlFrm.Dock = DockStyle.Fill;
tabPage2.Controls.Add(userControlFrm);
@ -222,7 +223,7 @@ namespace DHSoftware
public List<HikVisionCamera> HKCameras { get; } = new List<HikVisionCamera>();
public List<Camera> HKCameras { get; } = new List<Camera>();
public List<Do3ThinkCamera> Cameras { get; } = new List<Do3ThinkCamera>();
public Dictionary<string, SimboObjectDetection> Dectection { get; } = new Dictionary<string, SimboObjectDetection>();
public XinJEPLCTcpNet PLC { get; } = new XinJEPLCTcpNet();
@ -240,7 +241,8 @@ namespace DHSoftware
}
foreach (var camera in HKCameras)
{
camera.CameraDisConnect();
//var hk as HikVisionCamera;
//camera.CameraDisConnect();
}
PLC.PLCDisConnect();
}
@ -1496,8 +1498,35 @@ namespace DHSoftware
private void HandleSettingsButton()
{
// Add the code for the "设置" button click here
MessageBox.Show("设置按钮按下");
// MessageBox.Show("设置按钮按下");
List<CameraBase> listCamBase = new List<CameraBase>();
CameraBase cam1 = new CameraBase
{
CameraName = "Cam1",
CameraIP = "192.168.1.101",
SerialNumber = "1000001",
Gain = 60,
Exposure = 10,
RotateImage = 0,
isEnabled = false,
};
CameraBase cam2 = new CameraBase
{
CameraName = "Cam2",
CameraIP = "192.168.1.101",
SerialNumber = "1000002",
Gain = 60,
Exposure = 10,
RotateImage = 0,
isEnabled = false,
};
listCamBase.Add(cam1);
listCamBase.Add(cam2);
SettingWindow s = new SettingWindow();
s.cameras = listCamBase;
s.Show();
}