diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/README.md b/Windows/CS/Framework4.0/Toprie/Toprie/README.md index 674e2df..842406e 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/README.md +++ b/Windows/CS/Framework4.0/Toprie/Toprie/README.md @@ -163,6 +163,14 @@ 17. 当绘制温差图状态时，右击鼠标进入就绪状态 18. 初始状态/就绪状态，显示dataGridViewTempDiff，但只允许查看 +### btnNewTempRegion（新建测温区） +1. +### btnLoadTempRegion（加载测温区） +### btnSaveTempRegion（保存测温区） +### btnNewTempDiff（新建温差图） +### btnLoadTempDiff（加载温差图） +### btnSaveTempDiff（保存温差图） + #### 配置状态说明 1. 初始状态/就绪状态： - 显示btnDrawRegion和btnDrawTempDiff按钮、dataGridViewTempDiff diff --git a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs index dfe0553..74236af 100644 --- a/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs +++ b/Windows/CS/Framework4.0/Toprie/Toprie/Setting.cs @@ -2365,7 +2365,7 @@ namespace JoyD.Windows.CS private void SetButtonIcon() { // 创建一个表示绘制区域的图标 - Bitmap icon = new Bitmap(24, 24); + Bitmap icon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(icon)) { // 设置高质量绘图 @@ -2376,21 +2376,21 @@ namespace JoyD.Windows.CS g.Clear(Color.Transparent); // 绘制外矩形 - g.DrawRectangle(new Pen(Color.Black, 2), 3, 3, 18, 18); + g.DrawRectangle(new Pen(Color.Black, 2.5f), 4, 4, 24, 24); // 绘制虚线内矩形 using (Pen dashedPen = new Pen(Color.Black, 1.5f)) { dashedPen.DashPattern = new float[] { 2, 1 }; - g.DrawRectangle(dashedPen, 5, 5, 14, 14); + g.DrawRectangle(dashedPen, 7, 7, 18, 18); } // 绘制四个角的控制点 SolidBrush brush = new SolidBrush(Color.Black); - g.FillEllipse(brush, 6, 6, 3, 3); // 左上角 - g.FillEllipse(brush, 15, 6, 3, 3); // 右上角 - g.FillEllipse(brush, 6, 15, 3, 3); // 左下角 - g.FillEllipse(brush, 15, 15, 3, 3); // 右下角 + g.FillEllipse(brush, 8, 8, 4, 4); // 左上角 + g.FillEllipse(brush, 20, 8, 4, 4); // 右上角 + g.FillEllipse(brush, 8, 20, 4, 4); // 左下角 + g.FillEllipse(brush, 20, 20, 4, 4); // 右下角 } // 设置按钮图标并设置透明色 @@ -2400,7 +2400,7 @@ namespace JoyD.Windows.CS // 设置删除按钮的图标 try { - Bitmap deleteIcon = new Bitmap(24, 24); + Bitmap deleteIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(deleteIcon)) { // 设置高质量绘图 @@ -2410,9 +2410,9 @@ namespace JoyD.Windows.CS g.Clear(Color.Transparent); // 绘制一个红色的叉号作为删除图标 - Pen deletePen = new Pen(Color.Red, 3); - g.DrawLine(deletePen, 6, 6, 18, 18); // 从左上角到右下角的线 - g.DrawLine(deletePen, 18, 6, 6, 18); // 从右上角到左下角的线 + Pen deletePen = new Pen(Color.Red, 4); + g.DrawLine(deletePen, 8, 8, 24, 24); // 从左上角到右下角的线 + g.DrawLine(deletePen, 24, 8, 8, 24); // 从右上角到左下角的线 } btnDeleteRegion.Image = deleteIcon; @@ -2429,7 +2429,7 @@ namespace JoyD.Windows.CS // 设置绘制温差图按钮的图标 try { - Bitmap tempDiffIcon = new Bitmap(24, 24); + Bitmap tempDiffIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(tempDiffIcon)) { // 设置高质量绘图 @@ -2441,16 +2441,16 @@ namespace JoyD.Windows.CS // 绘制表示温差的图标 - 使用渐变效果 // 绘制底部蓝色（低温）和顶部红色（高温）的矩形条 using (LinearGradientBrush gradientBrush = new LinearGradientBrush( - new Rectangle(8, 5, 8, 14), + new Rectangle(10, 6, 12, 20), Color.Blue, // 低温端 Color.Red, // 高温端 LinearGradientMode.Vertical)) { - g.FillRectangle(gradientBrush, 8, 5, 8, 14); + g.FillRectangle(gradientBrush, 10, 6, 12, 20); } // 添加边框 - g.DrawRectangle(new Pen(Color.Black, 1), 8, 5, 8, 14); + g.DrawRectangle(new Pen(Color.Black, 1.5f), 10, 6, 12, 20); } btnDrawTempDiff.Image = tempDiffIcon; @@ -2464,7 +2464,7 @@ namespace JoyD.Windows.CS // 设置擦除按钮的图标 try { - Bitmap eraseTempDiffIcon = new Bitmap(24, 24); + Bitmap eraseTempDiffIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(eraseTempDiffIcon)) { // 设置高质量绘图 @@ -2473,17 +2473,29 @@ namespace JoyD.Windows.CS // 清除背景为透明 g.Clear(Color.Transparent); - // 绘制橡皮擦图标 - 一个矩形表示橡皮擦 - // 绘制橡皮擦主体 - using (Pen pen = new Pen(Color.Black, 2)) + // 绘制现代化的橡皮擦图标 + // 绘制橡皮擦主体（圆角矩形） + using (Pen pen = new Pen(Color.Black, 2.5f)) { - g.DrawRectangle(pen, 6, 8, 12, 10); + g.DrawRectangle(pen, 8, 10, 16, 14); + } + // 填充橡皮擦主体为浅灰色 + using (SolidBrush brush = new SolidBrush(Color.LightGray)) + { + g.FillRectangle(brush, 10, 11, 12, 9); } // 绘制橡皮擦手柄 - using (Pen pen = new Pen(Color.Black, 1.5f)) + using (Pen pen = new Pen(Color.Black, 2.5f)) { - g.DrawLine(pen, 12, 8, 12, 4); - g.DrawLine(pen, 10, 4, 14, 4); + g.DrawLine(pen, 16, 9, 16, 5); + g.DrawLine(pen, 12, 5, 20, 5); + } + // 添加擦拭痕迹效果 + using (Pen pen = new Pen(Color.Gray, 1.5f)) + { + pen.DashStyle = DashStyle.Dot; + g.DrawLine(pen, 5, 16, 27, 16); + g.DrawLine(pen, 6, 19, 24, 19); } } @@ -2498,7 +2510,7 @@ namespace JoyD.Windows.CS // 设置新建测温区按钮的图标 try { - Bitmap newTempRegionIcon = new Bitmap(24, 24); + Bitmap newTempRegionIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(newTempRegionIcon)) { // 设置高质量绘图 @@ -2507,17 +2519,22 @@ namespace JoyD.Windows.CS // 清除背景为透明 g.Clear(Color.Transparent); - // 绘制一个加号和矩形表示新建测温区 - // 绘制矩形 - using (Pen pen = new Pen(Color.Green, 2)) + // 绘制现代化的新建测温区图标 + // 绘制绿色矩形 + using (Pen pen = new Pen(Color.LimeGreen, 3)) { - g.DrawRectangle(pen, 5, 7, 14, 10); + g.DrawRectangle(pen, 8, 8, 16, 16); } - // 绘制加号 - using (Pen pen = new Pen(Color.Green, 2)) + // 在矩形右上角绘制加号 + using (Pen pen = new Pen(Color.LimeGreen, 3)) { - g.DrawLine(pen, 12, 7, 12, 17); // 垂直线 - g.DrawLine(pen, 7, 12, 17, 12); // 水平线 + g.DrawLine(pen, 20, 10, 20, 22); // 垂直线 + g.DrawLine(pen, 17, 16, 23, 16); // 水平线 + } + // 添加高温指示点 + using (SolidBrush brush = new SolidBrush(Color.Red)) + { + g.FillEllipse(brush, 21, 11, 3, 3); } } @@ -2532,7 +2549,7 @@ namespace JoyD.Windows.CS // 设置加载测温区按钮的图标 try { - Bitmap loadTempRegionIcon = new Bitmap(24, 24); + Bitmap loadTempRegionIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(loadTempRegionIcon)) { // 设置高质量绘图 @@ -2541,22 +2558,30 @@ namespace JoyD.Windows.CS // 清除背景为透明 g.Clear(Color.Transparent); - // 绘制一个文件夹和向下的箭头表示加载 - // 绘制文件夹 - using (Pen pen = new Pen(Color.Blue, 2)) + // 绘制现代化的加载测温区图标 + // 绘制蓝色文件夹 + using (SolidBrush brush = new SolidBrush(Color.DeepSkyBlue)) { - g.DrawLine(pen, 5, 10, 12, 6); // 文件夹顶部斜边 - g.DrawLine(pen, 12, 6, 19, 6); // 文件夹顶部 - g.DrawLine(pen, 19, 6, 19, 18); // 文件夹右侧 - g.DrawLine(pen, 19, 18, 5, 18); // 文件夹底部 - g.DrawLine(pen, 5, 18, 5, 10); // 文件夹左侧 + // 文件夹主体 + g.FillRectangle(brush, 8, 14, 16, 12); + // 文件夹顶部 + g.FillPolygon(brush, new Point[] { new Point(8, 14), new Point(12, 9), new Point(24, 9), new Point(24, 14) }); + } + // 文件夹轮廓 + using (Pen pen = new Pen(Color.DarkBlue, 2)) + { + g.DrawLine(pen, 8, 14, 12, 9); + g.DrawLine(pen, 12, 9, 24, 9); + g.DrawLine(pen, 24, 9, 24, 26); + g.DrawLine(pen, 24, 26, 8, 26); + g.DrawLine(pen, 8, 26, 8, 14); } // 绘制向下的箭头 - using (Pen pen = new Pen(Color.Blue, 2)) + using (Pen pen = new Pen(Color.DarkBlue, 2.5f)) { - g.DrawLine(pen, 12, 12, 12, 16); // 箭头竖线 - g.DrawLine(pen, 10, 14, 12, 16); // 箭头左斜线 - g.DrawLine(pen, 14, 14, 12, 16); // 箭头右斜线 + g.DrawLine(pen, 16, 16, 16, 20); + g.DrawLine(pen, 13, 18, 16, 21); + g.DrawLine(pen, 19, 18, 16, 21); } } @@ -2571,7 +2596,7 @@ namespace JoyD.Windows.CS // 设置保存测温区按钮的图标 try { - Bitmap saveTempRegionIcon = new Bitmap(24, 24); + Bitmap saveTempRegionIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(saveTempRegionIcon)) { // 设置高质量绘图 @@ -2580,22 +2605,30 @@ namespace JoyD.Windows.CS // 清除背景为透明 g.Clear(Color.Transparent); - // 绘制一个文件夹和向上的箭头表示保存 - // 绘制文件夹 - using (Pen pen = new Pen(Color.Brown, 2)) + // 绘制现代化的保存测温区图标 + // 绘制棕色文件夹 + using (SolidBrush brush = new SolidBrush(Color.Sienna)) { - g.DrawLine(pen, 5, 10, 12, 6); // 文件夹顶部斜边 - g.DrawLine(pen, 12, 6, 19, 6); // 文件夹顶部 - g.DrawLine(pen, 19, 6, 19, 18); // 文件夹右侧 - g.DrawLine(pen, 19, 18, 5, 18); // 文件夹底部 - g.DrawLine(pen, 5, 18, 5, 10); // 文件夹左侧 + // 文件夹主体 + g.FillRectangle(brush, 8, 14, 16, 12); + // 文件夹顶部 + g.FillPolygon(brush, new Point[] { new Point(8, 14), new Point(12, 9), new Point(24, 9), new Point(24, 14) }); + } + // 文件夹轮廓 + using (Pen pen = new Pen(Color.DarkGoldenrod, 2)) + { + g.DrawLine(pen, 8, 14, 12, 9); + g.DrawLine(pen, 12, 9, 24, 9); + g.DrawLine(pen, 24, 9, 24, 26); + g.DrawLine(pen, 24, 26, 8, 26); + g.DrawLine(pen, 8, 26, 8, 14); } // 绘制向上的箭头 - using (Pen pen = new Pen(Color.Brown, 2)) + using (Pen pen = new Pen(Color.DarkGoldenrod, 2.5f)) { - g.DrawLine(pen, 12, 8, 12, 12); // 箭头竖线 - g.DrawLine(pen, 10, 10, 12, 8); // 箭头左斜线 - g.DrawLine(pen, 14, 10, 12, 8); // 箭头右斜线 + g.DrawLine(pen, 16, 13, 16, 17); + g.DrawLine(pen, 13, 15, 16, 13); + g.DrawLine(pen, 19, 15, 16, 13); } } @@ -2610,7 +2643,7 @@ namespace JoyD.Windows.CS // 设置新建温差图按钮的图标 try { - Bitmap newTempDiffIcon = new Bitmap(24, 24); + Bitmap newTempDiffIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(newTempDiffIcon)) { // 设置高质量绘图 @@ -2619,23 +2652,33 @@ namespace JoyD.Windows.CS // 清除背景为透明 g.Clear(Color.Transparent); - // 绘制一个渐变条和加号表示新建温差图 + // 绘制现代化的新建温差图图标 // 绘制渐变条（蓝色到红色） using (LinearGradientBrush gradientBrush = new LinearGradientBrush( - new Rectangle(6, 8, 6, 10), + new Rectangle(8, 8, 10, 16), Color.Blue, // 低温端 Color.Red, // 高温端 LinearGradientMode.Vertical)) { - g.FillRectangle(gradientBrush, 6, 8, 6, 10); + g.FillRectangle(gradientBrush, 8, 8, 10, 16); } // 添加边框 - g.DrawRectangle(new Pen(Color.Black, 1), 6, 8, 6, 10); - // 绘制加号 - using (Pen pen = new Pen(Color.Black, 2)) + g.DrawRectangle(new Pen(Color.Black, 2), 8, 8, 10, 16); + // 绘制明显的加号 + using (Pen pen = new Pen(Color.Green, 3)) { - g.DrawLine(pen, 18, 13, 18, 13); // 垂直线 - g.DrawLine(pen, 16, 13, 20, 13); // 水平线 + g.DrawLine(pen, 23, 16, 23, 16); // 中心点 + g.DrawLine(pen, 20, 16, 26, 16); // 水平线 + g.DrawLine(pen, 23, 13, 23, 19); // 垂直线 + } + // 添加小三角形指示新建功能 + using (SolidBrush brush = new SolidBrush(Color.Green)) + { + g.FillPolygon(brush, new Point[] { + new Point(26, 13), + new Point(29, 13), + new Point(27, 10) + }); } } @@ -2650,7 +2693,7 @@ namespace JoyD.Windows.CS // 设置加载温差图按钮的图标 try { - Bitmap loadTempDiffIcon = new Bitmap(24, 24); + Bitmap loadTempDiffIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(loadTempDiffIcon)) { // 设置高质量绘图 @@ -2659,24 +2702,30 @@ namespace JoyD.Windows.CS // 清除背景为透明 g.Clear(Color.Transparent); - // 绘制一个渐变条和向下的箭头表示加载温差图 + // 绘制现代化的加载温差图图标 // 绘制渐变条（蓝色到红色） using (LinearGradientBrush gradientBrush = new LinearGradientBrush( - new Rectangle(6, 8, 6, 10), + new Rectangle(8, 8, 10, 16), Color.Blue, // 低温端 Color.Red, // 高温端 LinearGradientMode.Vertical)) { - g.FillRectangle(gradientBrush, 6, 8, 6, 10); + g.FillRectangle(gradientBrush, 8, 8, 10, 16); } // 添加边框 - g.DrawRectangle(new Pen(Color.Black, 1), 6, 8, 6, 10); - // 绘制向下的箭头 - using (Pen pen = new Pen(Color.Black, 1.5f)) + g.DrawRectangle(new Pen(Color.Black, 2), 8, 8, 10, 16); + // 绘制明显的向下箭头 + using (Pen pen = new Pen(Color.Blue, 2.5f)) { - g.DrawLine(pen, 18, 10, 18, 14); // 箭头竖线 - g.DrawLine(pen, 16, 12, 18, 14); // 箭头左斜线 - g.DrawLine(pen, 20, 12, 18, 14); // 箭头右斜线 + g.DrawLine(pen, 23, 13, 23, 19); // 箭头竖线 + g.DrawLine(pen, 20, 17, 23, 19); // 箭头左斜线 + g.DrawLine(pen, 26, 17, 23, 19); // 箭头右斜线 + } + // 添加波浪线表示数据流 + using (Pen pen = new Pen(Color.Blue, 1.5f)) + { + pen.DashStyle = DashStyle.Dot; + g.DrawLine(pen, 16, 23, 23, 23); } } @@ -2691,7 +2740,7 @@ namespace JoyD.Windows.CS // 设置保存温差图按钮的图标 try { - Bitmap saveTempDiffIcon = new Bitmap(24, 24); + Bitmap saveTempDiffIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(saveTempDiffIcon)) { // 设置高质量绘图 @@ -2700,24 +2749,31 @@ namespace JoyD.Windows.CS // 清除背景为透明 g.Clear(Color.Transparent); - // 绘制一个渐变条和向上的箭头表示保存温差图 + // 绘制现代化的保存温差图图标 // 绘制渐变条（蓝色到红色） using (LinearGradientBrush gradientBrush = new LinearGradientBrush( - new Rectangle(6, 8, 6, 10), + new Rectangle(8, 8, 10, 16), Color.Blue, // 低温端 Color.Red, // 高温端 LinearGradientMode.Vertical)) { - g.FillRectangle(gradientBrush, 6, 8, 6, 10); + g.FillRectangle(gradientBrush, 8, 8, 10, 16); } // 添加边框 - g.DrawRectangle(new Pen(Color.Black, 1), 6, 8, 6, 10); - // 绘制向上的箭头 - using (Pen pen = new Pen(Color.Black, 1.5f)) + g.DrawRectangle(new Pen(Color.Black, 2), 8, 8, 10, 16); + // 绘制明显的向上箭头 + using (Pen pen = new Pen(Color.Red, 2.5f)) { - g.DrawLine(pen, 18, 10, 18, 14); // 箭头竖线 - g.DrawLine(pen, 16, 12, 18, 10); // 箭头左斜线 - g.DrawLine(pen, 20, 12, 18, 10); // 箭头右斜线 + g.DrawLine(pen, 23, 12, 23, 17); // 箭头竖线 + g.DrawLine(pen, 20, 14, 23, 12); // 箭头左斜线 + g.DrawLine(pen, 26, 14, 23, 12); // 箭头右斜线 + } + // 添加保存符号（小磁盘） + using (Pen pen = new Pen(Color.Red, 1.5f)) + { + g.DrawRectangle(pen, 22, 9, 5, 5); + g.DrawLine(pen, 23, 9, 23, 6); + g.DrawLine(pen, 26, 9, 26, 6); } } @@ -2732,7 +2788,7 @@ namespace JoyD.Windows.CS // 设置添加温差图例按钮的图标 try { - Bitmap addTempDiffIcon = new Bitmap(24, 24); + Bitmap addTempDiffIcon = new Bitmap(32, 32); using (Graphics g = Graphics.FromImage(addTempDiffIcon)) { // 设置高质量绘图