diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/README.md b/Windows/CS/Framework4.0/Toprie/Toprie/README.md index 66b23a0..a3ecf97 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/README.md +++ b/Windows/CS/Framework4.0/Toprie/Toprie/README.md @@ -165,16 +165,16 @@ #### 配置状态说明 1. 初始状态/就绪状态: - 显示btnDrawRegion和btnDrawTempDiff按钮 - - 隐藏btnSelectColor、btnDeleteRegion按钮、dataGridViewTempDiff、btnAddTempDiff、btnDeleteTempDiff、btnBrushSize1、btnBrushSize3、btnBrushSize5、btnBrushSize10、btnBrushSize15 + - 隐藏btnSelectColor、btnDeleteRegion按钮、dataGridViewTempDiff、btnAddTempDiff、btnDeleteTempDiff、btnBrushSize1、btnBrushSize3、btnBrushSize5、btnBrushSize10、btnBrushSize15、btnBrushSize25 2. 选中区域状态: - 显示btnDeleteRegion和btnSelectColor按钮 - - 隐藏btnDrawRegion和btnDrawTempDiff按钮、dataGridViewTempDiff、btnAddTempDiff、btnDeleteTempDiff、btnBrushSize1、btnBrushSize3、btnBrushSize5、btnBrushSize10、btnBrushSize15 + - 隐藏btnDrawRegion和btnDrawTempDiff按钮、dataGridViewTempDiff、btnAddTempDiff、btnDeleteTempDiff、btnBrushSize1、btnBrushSize3、btnBrushSize5、btnBrushSize10、btnBrushSize15、btnBrushSize25 3. 绘制状态: - 显示btnSelectColor按钮 - 显示btnDrawRegion按钮 - 隐藏btnDeleteRegion按钮 - - 隐藏btnDrawTempDiff按钮、dataGridViewTempDiff、btnAddTempDiff、btnDeleteTempDiff、btnBrushSize1、btnBrushSize3、btnBrushSize5、btnBrushSize10、btnBrushSize15 + - 隐藏btnDrawTempDiff按钮、dataGridViewTempDiff、btnAddTempDiff、btnDeleteTempDiff、btnBrushSize1、btnBrushSize3、btnBrushSize5、btnBrushSize10、btnBrushSize15、btnBrushSize25 4. 绘制温差图状态: - 显示btnDrawTempDiff按钮,显示dataGridViewTempDiff、btnAddTempDiff、btnDeleteTempDiff - - 当选定温差图例后,显示btnBrushSize1、btnBrushSize3、btnBrushSize5、btnBrushSize10、btnBrushSize15 + - 当选定温差图例后,显示btnBrushSize1、btnBrushSize3、btnBrushSize5、btnBrushSize10、btnBrushSize15、btnBrushSize25 - 隐藏btnSelectColor、btnDeleteRegion、btnDrawRegion按钮 \ 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 f4eb775..0539e56 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.Designer.cs @@ -187,6 +187,18 @@ namespace JoyD.Windows.CS this.btnBrushSize15.ToolTipText = "选择15像素画笔"; this.btnBrushSize15.Click += new System.EventHandler(this.BtnBrushSize15_Click); // + // btnBrushSize25 + // + this.btnBrushSize25 = new System.Windows.Forms.ToolStripButton(); + this.btnBrushSize25.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.btnBrushSize25.Image = this.CreateBrushSizeImage(25, System.Drawing.Color.Brown); + this.btnBrushSize25.ImageTransparentColor = System.Drawing.Color.Magenta; + this.btnBrushSize25.Name = "btnBrushSize25"; + this.btnBrushSize25.Size = new System.Drawing.Size(23, 22); + this.btnBrushSize25.Text = "画笔大小25px"; + this.btnBrushSize25.ToolTipText = "选择25像素画笔"; + this.btnBrushSize25.Click += new System.EventHandler(this.BtnBrushSize25_Click); + // // toolStrip // this.toolStrip.AllowDrop = true; @@ -204,7 +216,8 @@ namespace JoyD.Windows.CS this.btnBrushSize3, this.btnBrushSize5, this.btnBrushSize10, - this.btnBrushSize15}); + this.btnBrushSize15, + this.btnBrushSize25}); this.toolStrip.Location = new System.Drawing.Point(3, 0); this.toolStrip.Name = "toolStrip"; this.toolStrip.Size = new System.Drawing.Size(104, 25); @@ -319,6 +332,7 @@ namespace JoyD.Windows.CS private System.Windows.Forms.ToolStripButton btnBrushSize5; private System.Windows.Forms.ToolStripButton btnBrushSize10; private System.Windows.Forms.ToolStripButton btnBrushSize15; + private System.Windows.Forms.ToolStripButton btnBrushSize25; private System.Windows.Forms.DataGridView dataGridViewTempDiff; } } \ No newline at end of file diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index 567c4ba..489808a 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -141,6 +141,16 @@ namespace JoyD.Windows.CS UpdateBrushSizeButtonSelection(15); } + /// + /// 25像素画笔大小按钮点击事件 + /// + private void BtnBrushSize25_Click(object sender, EventArgs e) + { + _currentBrushSize = 25; + // 更新按钮选中状态 + UpdateBrushSizeButtonSelection(25); + } + /// /// 创建表示画笔大小的图标 /// @@ -179,6 +189,7 @@ namespace JoyD.Windows.CS btnBrushSize5.Checked = false; btnBrushSize10.Checked = false; btnBrushSize15.Checked = false; + btnBrushSize25.Checked = false; // 设置当前选中按钮的选中状态 switch (selectedSize) @@ -198,6 +209,9 @@ namespace JoyD.Windows.CS case 15: btnBrushSize15.Checked = true; break; + case 25: + btnBrushSize25.Checked = true; + break; } } catch (Exception ex) @@ -473,6 +487,7 @@ namespace JoyD.Windows.CS btnBrushSize5.Visible = true; btnBrushSize10.Visible = true; btnBrushSize15.Visible = true; + btnBrushSize25.Visible = true; // 获取选中行的索引 int selectedRowIndex = -1; @@ -496,6 +511,7 @@ namespace JoyD.Windows.CS btnBrushSize5.Image = CreateBrushSizeImage(5, selectedColor); btnBrushSize10.Image = CreateBrushSizeImage(10, selectedColor); btnBrushSize15.Image = CreateBrushSizeImage(15, selectedColor); + btnBrushSize25.Image = CreateBrushSizeImage(25, selectedColor); } // 确保当前选中的画笔大小按钮处于选中状态 @@ -516,6 +532,7 @@ namespace JoyD.Windows.CS btnBrushSize5.Visible = false; btnBrushSize10.Visible = false; btnBrushSize15.Visible = false; + btnBrushSize25.Visible = false; // 隐藏分隔条 if (toolStripSeparator != null)