From 1bc2df66bc88a6405df345dccc24a5031e18b592 Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期一, 21 十二月 2020 09:54:48 +0800
Subject: [PATCH] 1. gocator添加byte2/byte4的配置，目前测试byte4不成功，暂时还是使用byte2配置。 2. 添加键名代码映射配置和NG键名代码上传功能
---
src/Bro.M071.Process/UI/KeyIndicator.cs | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/Bro.M071.Process/UI/KeyIndicator.cs b/src/Bro.M071.Process/UI/KeyIndicator.cs
index 8d43b6b..6a0b128 100644
--- a/src/Bro.M071.Process/UI/KeyIndicator.cs
+++ b/src/Bro.M071.Process/UI/KeyIndicator.cs
@@ -20,7 +20,7 @@
[Browsable(false)]
public override string Name { get => base.Name; set => base.Name = value; }
[Browsable(false)]
- public override Font Font { get => base.Font; set => base.Font = value; }
+ public override Font Font { get; set; } = new Font(new FontFamily("Tahoma"), 12, FontStyle.Bold, GraphicsUnit.World);
[Browsable(false)]
public override int FontDistance { get => base.FontDistance; set => base.FontDistance = value; }
[Browsable(false)]
@@ -63,7 +63,10 @@
public override void Draw(Graphics g)
{
- g.DrawRectangle(Pen, DisplayRect);
+ if (ResultState == null)
+ {
+ g.DrawRectangle(Pen, DisplayRect);
+ }
RectangleF rectFill = new RectangleF(DisplayRect.X + 1, DisplayRect.Y + 1, DisplayRect.Width - 2, DisplayRect.Height - 2);
if (ResultState != null)
{
@@ -74,11 +77,12 @@
if (!ResultState.Value)
{
backColor = Color.Red;
- foreColor = Color.White;
+ //foreColor = Color.White;
}
+ g.FillRectangle(new SolidBrush(Color.FromArgb(85, backColor)), rectFill);
+
g.DrawString(Text, Font, new SolidBrush(foreColor), (float)(DisplayRect.X + DisplayRect.Width / 2.0 - txtSize.Width / 2.0), (float)(DisplayRect.Y + DisplayRect.Height / 2.0 - txtSize.Height / 2.0));
- g.FillRectangle(new SolidBrush(Color.FromArgb(55, backColor)), rectFill);
}
}
@@ -153,7 +157,7 @@
return Math.Abs(p.X - (DisplayRect.X + DisplayRect.Width)) < (DisplayRect.Width / 3) && Math.Abs(p.Y - (DisplayRect.Y + DisplayRect.Height)) < (DisplayRect.Height / 3);
}
- int x, y = 0;
+ //int x, y = 0;
public override void StretchBottom(Point p)
{
if (p.Y > DisplayRect.Y)
--
Gitblit v1.8.0