From 0433c0316d22acdeea42a6ef76716eb5fa1f6abe Mon Sep 17 00:00:00 2001 From: zqm Date: Fri, 7 Nov 2025 15:06:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E6=89=80=E6=9C=89=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=A4=84=E7=90=86=E7=A8=8B=E5=BA=8F=E4=BB=8ESetting.cs?= =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E5=88=B0Setting.Designer.cs=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D=E7=9A=84=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E5=A4=84=E7=90=86=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CS/Framework4.0/Toprie/Toprie/README.md | 3 ++ .../Toprie/Toprie/Setting.Designer.cs | 21 ++++++++- .../CS/Framework4.0/Toprie/Toprie/Setting.cs | 44 +++++-------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/README.md b/Windows/CS/Framework4.0/Toprie/Toprie/README.md index 7ec86e3..fe7c20a 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/README.md +++ b/Windows/CS/Framework4.0/Toprie/Toprie/README.md @@ -155,3 +155,6 @@ 9. 选中区域时，工具栏显示按钮btnDeleteRegion和btnSelectColor;隐藏btnDrawRegion。 10. 当选中区域时，btnSelectColor用于改变选中区域的颜色。 11. 当选中区域时，btnDeleteRegion用于删除该区域，删除后btnSelectColor隐藏，btnDrawRegion显示。 +12. 当选中区域时，鼠标移动到八个句柄上，显示对应的光标，用于调整区域大小。 +13. 当选中区域时，鼠标可以移动区域，用于调整区域位置。 +14. 当就绪状态时，工具栏显示绘制温差图按钮（btnDrawTempDiff） \ No newline at end of file diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs index d39aa81..14e7dc5 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs @@ -1,4 +1,4 @@ -namespace JoyD.Windows.CS +namespace JoyD.Windows.CS { partial class Setting { @@ -145,6 +145,25 @@ this.btnDeleteRegion.Size = new System.Drawing.Size(23, 4); this.btnDeleteRegion.Text = "删除区域"; this.btnDeleteRegion.ToolTipText = "删除选中的区域"; + this.btnDeleteRegion.Click += new System.EventHandler(this.BtnDeleteRegion_Click); + // + // btnDrawRegion + // + this.btnDrawRegion.Click += new System.EventHandler(this.BtnDrawRegion_Click); + // + // btnSelectColor + // + this.btnSelectColor.Click += new System.EventHandler(this.BtnSelectColor_Click); + // + // picBoxTemp + // + this.picBoxTemp.MouseClick += new System.Windows.Forms.MouseEventHandler(this.PicBoxTemp_MouseClick); + this.picBoxTemp.SizeChanged += new System.EventHandler(this.PicBoxTemp_SizeChanged); + // + // Setting + // 设置窗体事件 + this.Shown += new System.EventHandler(this.Setting_Shown); + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Setting_FormClosing); // // Setting // diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index 56ccf3f..87cf304 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -39,9 +39,6 @@ namespace JoyD.Windows.CS { InitializeComponent(); - // 订阅SizeChanged事件，确保控件大小变化时矩形框正确缩放 - this.picBoxTemp.SizeChanged += new EventHandler(PicBoxTemp_SizeChanged); - // 设置按钮图标 SetButtonIcon(); @@ -49,27 +46,12 @@ namespace JoyD.Windows.CS _timer = new Timer { Interval = 1000 }; _timer.Tick += Timer_Tick; - // 注册窗口事件 - this.Shown += Setting_Shown; - this.FormClosing += Setting_FormClosing; - - // 注册按钮点击事件 - btnDrawRegion.Click += BtnDrawRegion_Click; - btnSelectColor.Click += BtnSelectColor_Click; - - // 注册鼠标事件 - picBoxTemp.MouseClick += PicBoxTemp_MouseClick; - picBoxTemp.MouseDown += PicBoxTemp_MouseDown; - // 初始隐藏颜色选择按钮，只有在绘制模式下才显示 btnSelectColor.Visible = false; - // 初始化删除按钮 - // 假设表单设计器中已有一个名为btnDeleteRegion的按钮 + // 初始隐藏删除按钮，只有在选中区域时才显示 try { - btnDeleteRegion.Click += BtnDeleteRegion_Click; - // 初始隐藏删除按钮，只有在选中区域时才显示 btnDeleteRegion.Visible = false; } catch (Exception ex) @@ -79,7 +61,7 @@ namespace JoyD.Windows.CS } /// - /// 鼠标按下事件 - 处理右击退出绘制状态 + /// 鼠标按下事件 - 处理右击退出绘制状态和左击开始绘制矩形 /// private void PicBoxTemp_MouseDown(object sender, MouseEventArgs e) { @@ -106,6 +88,13 @@ namespace JoyD.Windows.CS // 刷新绘制 picBoxTemp.Invalidate(); } + // 处理左击开始绘制矩形 + else if (e.Button == MouseButtons.Left && _isDrawingMode) + { + _startPoint = e.Location; + _isDrawing = true; + _currentRectangle = new Rectangle(e.X, e.Y, 0, 0); + } } /// @@ -197,18 +186,7 @@ namespace JoyD.Windows.CS ); } - /// - /// 鼠标按下事件 - 开始绘制矩形 - /// - private void PicBoxTemp_MouseDown(object sender, MouseEventArgs e) - { - if (e.Button == MouseButtons.Left && _isDrawingMode) - { - _startPoint = e.Location; - _isDrawing = true; - _currentRectangle = new Rectangle(e.X, e.Y, 0, 0); - } - } + /// /// 鼠标移动事件 - 更新矩形大小或检测鼠标悬停区域