diff --git a/DH.Commons/Base/CameraBase.cs b/DH.Commons/Base/CameraBase.cs index ee9ac95..07eee8a 100644 --- a/DH.Commons/Base/CameraBase.cs +++ b/DH.Commons/Base/CameraBase.cs @@ -2,6 +2,7 @@ using System.ComponentModel; using System.Drawing.Imaging; using AntdUI; +using DH.Commons.Enums; using OpenCvSharp; namespace DH.Commons.Base @@ -10,24 +11,26 @@ namespace DH.Commons.Base { // 私有字段 + 带通知的属性（与DetectionLabel风格一致） private bool _isEnabled = false; + private bool _isallPicEnabled = true;//默认全画幅 private bool _isContinueMode = false; private bool _isSavePicEnabled = false; private string _imageSaveDirectory; + private EnumCamType _CamType; private ImageFormat _imageFormat = ImageFormat.Jpeg; - private bool _isHardwareTrigger = false; + private bool _isHardwareTrigger = true; private string _serialNumber = string.Empty; private string _cameraName = string.Empty; private string _cameraIP = string.Empty; private string _computerIP = string.Empty; private bool _isDirectHardwareTrigger = false; - private float _gain = -1; + private float _gain =6; private float _rotateImage = 0; private float _exposure = 200; private float _triggerDelay = 0; private decimal _roiX = 0; private decimal _roiY = 0; - private decimal _roiW = 0; - private decimal _roiH = 0; + private decimal _roiW = 2448; + private decimal _roiH = 2048; private int _lineDebouncerTime = 0; public volatile int SnapshotCount = 0; @@ -56,7 +59,16 @@ namespace DH.Commons.Base OnPropertyChanged(nameof(IsEnabled)); } } - + public virtual bool IsAllPicEnabled + { + get => _isallPicEnabled; + set + { + if (_isallPicEnabled == value) return; + _isallPicEnabled = value; + OnPropertyChanged(nameof(IsAllPicEnabled)); + } + } public virtual bool IsSavePicEnabled { get => _isSavePicEnabled; @@ -95,6 +107,19 @@ namespace DH.Commons.Base OnPropertyChanged(nameof(ImageFormat)); } } + [Category("设备配置")] + [DisplayName("相机类型")] + [Description("相机类型")] + public EnumCamType CamType + { + get => _CamType; + set + { + if (_CamType == value) return; + _CamType = value; + OnPropertyChanged(nameof(CamType)); + } + } [Category("采图模式")] [DisplayName("硬触发")] diff --git a/DH.Commons/Base/DetectionConfig.cs b/DH.Commons/Base/DetectionConfig.cs index eef9d99..60f89a9 100644 --- a/DH.Commons/Base/DetectionConfig.cs +++ b/DH.Commons/Base/DetectionConfig.cs @@ -932,8 +932,8 @@ namespace DH.Commons.Base private bool _selected = false; private string _labelId; private string _labelName; - private double _maxSource; - private double _minSource; + private double _maxScore; + private double _minScore; private double _maxArea; private double _minArea; private ResultState _resultState = ResultState.ResultTBD; @@ -976,25 +976,25 @@ namespace DH.Commons.Base } } - public double MaxSource + public double MaxScore { - get { return _maxSource; } + get { return _maxScore; } set { - if (_maxSource.Equals(value)) return; - _maxSource = value; - OnPropertyChanged(nameof(MaxSource)); + if (_maxScore.Equals(value)) return; + _maxScore = value; + OnPropertyChanged(nameof(MaxScore)); } } - public double MinSource + public double MinScore { - get { return _minSource; } + get { return _minScore; } set { - if (_minSource.Equals(value)) return; - _minSource = value; - OnPropertyChanged(nameof(MinSource)); + if (_minScore.Equals(value)) return; + _minScore = value; + OnPropertyChanged(nameof(MinScore)); } } diff --git a/DH.Commons/Base/GloablConfig.cs b/DH.Commons/Base/GloablConfig.cs new file mode 100644 index 0000000..ce0e51d --- /dev/null +++ b/DH.Commons/Base/GloablConfig.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DH.Commons.Base +{ + internal class GloablConfig + { + } +} diff --git a/DH.Commons/Enums/Enum.cs b/DH.Commons/Enums/Enum.cs index 07a5af3..8c17014 100644 --- a/DH.Commons/Enums/Enum.cs +++ b/DH.Commons/Enums/Enum.cs @@ -36,7 +36,14 @@ namespace DH.Commons.Enums infernce } - + public enum EnumCamType + { + [Description("度申相机")] + 度申Do3think = 0, + [Description("海康相机")] + 海康hik , + + } public enum EnumPLCType @@ -93,7 +100,11 @@ namespace DH.Commons.Enums 工件最小值=27, 工具最大值=28, 启用心跳=29, - 心跳地址=30 + 心跳地址=30, + 挡料电机回原点, + 挡料电机回原点速度, + + } diff --git a/DHSoftware/Views/CameraControl.Designer.cs b/DHSoftware/Views/CameraControl.Designer.cs index 086b611..21cd9ef 100644 --- a/DHSoftware/Views/CameraControl.Designer.cs +++ b/DHSoftware/Views/CameraControl.Designer.cs @@ -52,15 +52,23 @@ button3 = new AntdUI.Button(); sthPic = new AntdUI.Switch(); label6 = new AntdUI.Label(); + label8 = new AntdUI.Label(); + label9 = new AntdUI.Label(); + label10 = new AntdUI.Label(); + label11 = new AntdUI.Label(); + sthAllPic = new AntdUI.Switch(); + label12 = new AntdUI.Label(); + sltCamType = new AntdUI.Select(); + label13 = new AntdUI.Label(); ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit(); SuspendLayout(); // // swhEnable // swhEnable.CheckedText = "启用"; - swhEnable.Location = new Point(84, 13); + swhEnable.Location = new Point(93, 13); swhEnable.Name = "swhEnable"; - swhEnable.Size = new Size(93, 33); + swhEnable.Size = new Size(94, 33); swhEnable.TabIndex = 13; swhEnable.UnCheckedText = "关闭"; // @@ -74,123 +82,123 @@ // // label1 // - label1.Location = new Point(28, 114); + label1.Location = new Point(28, 140); label1.Name = "label1"; - label1.Size = new Size(59, 23); + label1.Size = new Size(59, 36); label1.TabIndex = 14; label1.Text = "曝 光"; // // label2 // - label2.Location = new Point(28, 156); + label2.Location = new Point(28, 183); label2.Name = "label2"; - label2.Size = new Size(59, 23); + label2.Size = new Size(59, 36); label2.TabIndex = 15; label2.Text = "增 益"; // // label3 // - label3.Location = new Point(28, 198); + label3.Location = new Point(28, 226); label3.Name = "label3"; - label3.Size = new Size(59, 23); + label3.Size = new Size(59, 36); label3.TabIndex = 16; label3.Text = "旋转角度"; // // iptExposure // - iptExposure.Location = new Point(84, 100); + iptExposure.Location = new Point(93, 140); iptExposure.Name = "iptExposure"; - iptExposure.Size = new Size(93, 37); + iptExposure.Size = new Size(94, 36); iptExposure.TabIndex = 17; iptExposure.Tag = ""; iptExposure.Text = "0"; // // iptGain // - iptGain.Location = new Point(84, 143); + iptGain.Location = new Point(93, 183); iptGain.Name = "iptGain"; - iptGain.Size = new Size(93, 37); + iptGain.Size = new Size(94, 36); iptGain.TabIndex = 18; iptGain.Text = "0"; // // iptRevolve // - iptRevolve.Location = new Point(84, 186); + iptRevolve.Location = new Point(93, 226); iptRevolve.Name = "iptRevolve"; - iptRevolve.Size = new Size(93, 37); + iptRevolve.Size = new Size(94, 36); iptRevolve.TabIndex = 19; iptRevolve.Text = "0"; // // label4 // - label4.Location = new Point(28, 242); + label4.Location = new Point(28, 269); label4.Name = "label4"; - label4.Size = new Size(59, 23); + label4.Size = new Size(59, 36); label4.TabIndex = 20; label4.Text = "采图模式"; // // sltAcquisitionMode // sltAcquisitionMode.List = true; - sltAcquisitionMode.Location = new Point(84, 229); + sltAcquisitionMode.Location = new Point(93, 269); sltAcquisitionMode.Name = "sltAcquisitionMode"; - sltAcquisitionMode.Size = new Size(93, 36); + sltAcquisitionMode.Size = new Size(94, 36); sltAcquisitionMode.TabIndex = 21; // // label5 // - label5.Location = new Point(28, 287); + label5.Location = new Point(28, 314); label5.Name = "label5"; - label5.Size = new Size(59, 23); + label5.Size = new Size(59, 36); label5.TabIndex = 22; label5.Text = "触发模式"; // // sltTriggerMode // sltTriggerMode.List = true; - sltTriggerMode.Location = new Point(84, 274); + sltTriggerMode.Location = new Point(93, 314); sltTriggerMode.Name = "sltTriggerMode"; - sltTriggerMode.Size = new Size(93, 36); + sltTriggerMode.Size = new Size(94, 36); sltTriggerMode.TabIndex = 26; // // label7 // - label7.Location = new Point(28, 397); + label7.Location = new Point(19, 476); label7.Name = "label7"; - label7.Size = new Size(59, 23); + label7.Size = new Size(29, 23); label7.TabIndex = 28; - label7.Text = "ROI范围"; + label7.Text = "ROI"; // // iptROIW // - iptROIW.Location = new Point(84, 414); + iptROIW.Location = new Point(93, 494); iptROIW.Name = "iptROIW"; - iptROIW.Size = new Size(93, 37); + iptROIW.Size = new Size(94, 37); iptROIW.TabIndex = 31; iptROIW.Text = "0"; // // iptROIY // - iptROIY.Location = new Point(84, 371); + iptROIY.Location = new Point(93, 451); iptROIY.Name = "iptROIY"; - iptROIY.Size = new Size(93, 37); + iptROIY.Size = new Size(94, 37); iptROIY.TabIndex = 30; iptROIY.Text = "0"; // // iptROIX // - iptROIX.Location = new Point(84, 328); + iptROIX.Location = new Point(93, 408); iptROIX.Name = "iptROIX"; - iptROIX.Size = new Size(93, 37); + iptROIX.Size = new Size(94, 37); iptROIX.TabIndex = 29; iptROIX.Tag = ""; iptROIX.Text = "0"; // // iptROIH // - iptROIH.Location = new Point(84, 457); + iptROIH.Location = new Point(93, 537); iptROIH.Name = "iptROIH"; - iptROIH.Size = new Size(93, 37); + iptROIH.Size = new Size(94, 37); iptROIH.TabIndex = 32; iptROIH.Text = "0"; // @@ -199,7 +207,7 @@ pictureBox1.BorderStyle = BorderStyle.FixedSingle; pictureBox1.Location = new Point(219, 23); pictureBox1.Name = "pictureBox1"; - pictureBox1.Size = new Size(659, 429); + pictureBox1.Size = new Size(659, 489); pictureBox1.TabIndex = 33; pictureBox1.TabStop = false; // @@ -210,7 +218,7 @@ btnSizeAdd.Ghost = true; btnSizeAdd.IconRatio = 0F; btnSizeAdd.IconSvg = ""; - btnSizeAdd.Location = new Point(280, 458); + btnSizeAdd.Location = new Point(282, 532); btnSizeAdd.Name = "btnSizeAdd"; btnSizeAdd.Size = new Size(80, 38); btnSizeAdd.TabIndex = 34; @@ -223,7 +231,7 @@ button1.Ghost = true; button1.IconRatio = 0F; button1.IconSvg = ""; - button1.Location = new Point(438, 458); + button1.Location = new Point(440, 532); button1.Name = "button1"; button1.Size = new Size(80, 38); button1.TabIndex = 35; @@ -236,7 +244,7 @@ button2.Ghost = true; button2.IconRatio = 0F; button2.IconSvg = ""; - button2.Location = new Point(593, 458); + button2.Location = new Point(595, 532); button2.Name = "button2"; button2.Size = new Size(80, 38); button2.TabIndex = 36; @@ -249,7 +257,7 @@ button3.Ghost = true; button3.IconRatio = 0F; button3.IconSvg = ""; - button3.Location = new Point(741, 458); + button3.Location = new Point(743, 532); button3.Name = "button3"; button3.Size = new Size(80, 38); button3.TabIndex = 37; @@ -258,9 +266,9 @@ // sthPic // sthPic.CheckedText = "启用"; - sthPic.Location = new Point(84, 60); + sthPic.Location = new Point(93, 60); sthPic.Name = "sthPic"; - sthPic.Size = new Size(93, 33); + sthPic.Size = new Size(94, 33); sthPic.TabIndex = 39; sthPic.UnCheckedText = "关闭"; // @@ -272,10 +280,83 @@ label6.TabIndex = 38; label6.Text = "相 机 图"; // + // label8 + // + label8.Location = new Point(58, 408); + label8.Name = "label8"; + label8.Size = new Size(29, 37); + label8.TabIndex = 40; + label8.Text = "X:"; + // + // label9 + // + label9.Location = new Point(58, 451); + label9.Name = "label9"; + label9.Size = new Size(29, 37); + label9.TabIndex = 41; + label9.Text = "Y:"; + // + // label10 + // + label10.Location = new Point(43, 494); + label10.Name = "label10"; + label10.Size = new Size(44, 37); + label10.TabIndex = 42; + label10.Text = "宽度："; + // + // label11 + // + label11.Location = new Point(43, 538); + label11.Name = "label11"; + label11.Size = new Size(44, 36); + label11.TabIndex = 43; + label11.Text = "高度："; + // + // sthAllPic + // + sthAllPic.CheckedText = "启用"; + sthAllPic.Location = new Point(93, 356); + sthAllPic.Name = "sthAllPic"; + sthAllPic.Size = new Size(94, 33); + sthAllPic.TabIndex = 45; + sthAllPic.UnCheckedText = "关闭"; + // + // label12 + // + label12.Location = new Point(28, 366); + label12.Name = "label12"; + label12.Size = new Size(59, 23); + label12.TabIndex = 44; + label12.Text = "全 画 幅"; + // + // sltCamType + // + sltCamType.List = true; + sltCamType.Location = new Point(93, 97); + sltCamType.Name = "sltCamType"; + sltCamType.Size = new Size(94, 36); + sltCamType.TabIndex = 47; + // + // label13 + // + label13.Location = new Point(28, 99); + label13.Name = "label13"; + label13.Size = new Size(59, 36); + label13.TabIndex = 46; + label13.Text = "相机类型"; + // // CameraControl // AutoScaleDimensions = new SizeF(7F, 17F); AutoScaleMode = AutoScaleMode.Font; + Controls.Add(sltCamType); + Controls.Add(label13); + Controls.Add(sthAllPic); + Controls.Add(label12); + Controls.Add(label11); + Controls.Add(label10); + Controls.Add(label9); + Controls.Add(label8); Controls.Add(sthPic); Controls.Add(label6); Controls.Add(button3); @@ -301,7 +382,7 @@ Controls.Add(swhEnable); Controls.Add(label18); Name = "CameraControl"; - Size = new Size(909, 505); + Size = new Size(909, 601); ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit(); ResumeLayout(false); } @@ -332,5 +413,13 @@ private AntdUI.Button button3; private AntdUI.Switch sthPic; private AntdUI.Label label6; + private AntdUI.Label label8; + private AntdUI.Label label9; + private AntdUI.Label label10; + private AntdUI.Label label11; + private AntdUI.Switch sthAllPic; + private AntdUI.Label label12; + private AntdUI.Select sltCamType; + private AntdUI.Label label13; } } diff --git a/DHSoftware/Views/CameraControl.cs b/DHSoftware/Views/CameraControl.cs index 4545ae2..0c99e1b 100644 --- a/DHSoftware/Views/CameraControl.cs +++ b/DHSoftware/Views/CameraControl.cs @@ -10,6 +10,8 @@ using System.Windows.Forms; using AntdUI; using DH.Commons.Base; using DH.Commons.Enums; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; +using Window = AntdUI.Window; namespace DHSoftware.Views { @@ -17,17 +19,42 @@ namespace DHSoftware.Views { Window window; CameraBase CameraBase; - public CameraControl(Window _window,CameraBase cameraBase) + public CameraControl(Window _window, CameraBase cameraBase) { - window= _window; + window = _window; CameraBase = cameraBase; InitializeComponent(); - + sltCamType.TextChanged += SltCamTpye_TextChanged; InitData(); BindData(); } + private void SltCamTpye_TextChanged(object? sender, EventArgs e) + { + if (sender is Select slt && !string.IsNullOrEmpty(slt.Text)) + { + // 将文本转换为枚举值 + if (Enum.TryParse(slt.Text, out var plcType)) + { + switch (plcType) + { + case EnumCamType.度申Do3think: + case EnumCamType.海康hik: + + break; + + + default: + break; + } + } + else + { + + } + } + } private void SltAcquisitionMode_SelectedIndexChanged(object sender, IntEventArgs e) @@ -40,7 +67,7 @@ namespace DHSoftware.Views case (int)CameraAcquisitionMode.触发模式: sltTriggerMode.Enabled = true; break; - default: + default: break; } } @@ -48,10 +75,12 @@ namespace DHSoftware.Views private void BindData() { - - sthPic.DataBindings.Add(nameof(sthPic.Checked), CameraBase, nameof(CameraBase.IsSavePicEnabled), + sltCamType.DataBindings.Add("Text", CameraBase, "CamType", true, DataSourceUpdateMode.OnPropertyChanged, ""); + sthPic.DataBindings.Add(nameof(sthPic.Checked), CameraBase, nameof(CameraBase.IsSavePicEnabled), true, DataSourceUpdateMode.OnPropertyChanged); + sthAllPic.DataBindings.Add(nameof(sthAllPic.Checked), CameraBase, nameof(CameraBase.IsAllPicEnabled), + true, DataSourceUpdateMode.OnPropertyChanged); // 启用状态绑定 swhEnable.DataBindings.Add(nameof(swhEnable.Checked), CameraBase, nameof(CameraBase.IsEnabled), true, DataSourceUpdateMode.OnPropertyChanged); @@ -89,6 +118,12 @@ namespace DHSoftware.Views private void InitData() { + // 获取枚举字段名列表（原描述改为字段名） + sltCamType.Items.Clear(); + foreach (EnumCamType value in Enum.GetValues(typeof(EnumCamType))) + { + sltCamType.Items.Add(value.ToString()); + } // 初始化下拉框选项 sltAcquisitionMode.Items.AddRange(new[] { "连续模式", "触发模式" }); sltTriggerMode.Items.AddRange(new[] { "软触发", "硬触发" }); @@ -97,5 +132,6 @@ namespace DHSoftware.Views sltAcquisitionMode.SelectedIndex = CameraBase.IsContinueMode ? 0 : 1; sltTriggerMode.SelectedIndex = CameraBase.IsHardwareTrigger ? 1 : 0; } + } } diff --git a/DHSoftware/Views/CameraControl.resx b/DHSoftware/Views/CameraControl.resx index 8b2ff64..af32865 100644 --- a/DHSoftware/Views/CameraControl.resx +++ b/DHSoftware/Views/CameraControl.resx @@ -1,7 +1,7 @@