diff --git a/Windows/CS/Framework4.0/Camera/Camera/Setting.cs b/Windows/CS/Framework4.0/Camera/Camera/Setting.cs index 1632231..2f8cc7a 100644 --- a/Windows/CS/Framework4.0/Camera/Camera/Setting.cs +++ b/Windows/CS/Framework4.0/Camera/Camera/Setting.cs @@ -219,18 +219,23 @@ namespace Camera Image currentImage = picBoxCamera.Image; if (currentImage == null) return; - int imageWidth, imageHeight; + int imageWidth = 0, imageHeight = 0; + bool imageValid = false; try { imageWidth = currentImage.Width; imageHeight = currentImage.Height; - if (imageWidth <= 0 || imageHeight <= 0) return; + if (imageWidth > 0 && imageHeight > 0) + { + imageValid = true; + } } catch { - return; } + if (!imageValid) return; + Graphics g = e.Graphics; g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias; @@ -576,6 +581,24 @@ namespace Camera private void PicBoxCamera_MouseUp(object sender, MouseEventArgs e) { + if (e.Button == MouseButtons.Right) + { + if (_isEditingDetectionZone) + { + _isEditingDetectionZone = false; + toolStripButton1.Checked = false; + toolStripButton1.ToolTipText = "修改检测区(点击开启)"; + return; + } + if (_isEditingLedZone) + { + _isEditingLedZone = false; + toolStripButton2.Checked = false; + toolStripButton2.ToolTipText = "绘制Led区(点击开启)"; + return; + } + } + Image currentImage = picBoxCamera.Image; if (currentImage == null || _camera == null) return; @@ -746,7 +769,6 @@ namespace Camera toolStripButton1.ToolTipText = "修改检测区(点击开启)"; } UpdateDataGridView(); - picBoxCamera.Invalidate(); } private void ToolStripButton2_Click(object sender, EventArgs e) @@ -768,7 +790,6 @@ namespace Camera toolStripButton2.ToolTipText = "绘制Led区(点击开启)"; } UpdateDataGridView(); - picBoxCamera.Invalidate(); } private void Setting_FormClosed(object sender, FormClosedEventArgs e)