From 1f2fa3f54d4a7b5a2f601c4c947a06476342e3bd Mon Sep 17 00:00:00 2001
From: patrick.xu <patrick.xu@broconcentric.com>
Date: 星期五, 22 一月 2021 09:23:06 +0800
Subject: [PATCH] 1. gocator驱动将system.stop移到system.ReceiveData之后 2. 修改测量完成后状态切换逻辑，避免安全光线等干扰 3. 添加设备异常输出日志记录 4. 产品结果输出时做硬盘文件记录
---
src/Bro.UI.Model.Winform/Element/ROI_Circle.cs | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/Bro.UI.Model.Winform/Element/ROI_Circle.cs b/src/Bro.UI.Model.Winform/Element/ROI_Circle.cs
index 488958b..0bd2da7 100644
--- a/src/Bro.UI.Model.Winform/Element/ROI_Circle.cs
+++ b/src/Bro.UI.Model.Winform/Element/ROI_Circle.cs
@@ -28,10 +28,6 @@
{
}
- public override void CalculateBaseRectangle()
- {
- }
-
public override object Clone()
{
ROI_Circle circle = new ROI_Circle();
@@ -45,7 +41,7 @@
public override void Draw(Graphics g)
{
- g.FillEllipse(new SolidBrush(Color.Red), new RectangleF(Center.X, Center.Y, 1.0f, 1.0f));
+ g.FillEllipse(new SolidBrush(Color.Red), new RectangleF((float)Center.X, (float)Center.Y, 1.0f, 1.0f));
Pen pen = null;
if (ROI_Index == "1")
@@ -56,7 +52,7 @@
"P1",
new Font(new FontFamily("瀹嬩綋"), 40.0f),
new SolidBrush(Color.Red),
- new PointF(Center.X - Radius - 80, Center.Y - Radius - 40)
+ new PointF((float)Center.X - Radius - 80, (float)Center.Y - Radius - 40)
);
}
else
@@ -65,11 +61,11 @@
}
pen.DashStyle = System.Drawing.Drawing2D.DashStyle.DashDot;
- g.DrawEllipse(pen, Center.X - Radius, Center.Y - Radius, Radius * 2, Radius * 2);
+ g.DrawEllipse(pen, (float)Center.X - Radius, (float)Center.Y - Radius, Radius * 2, Radius * 2);
if (ROI_Index == "1")
{
- g.DrawEllipse(pen, Center.X - Radius - 15, Center.Y - Radius - 15, Radius * 2 + 30, Radius * 2 + 30);
+ g.DrawEllipse(pen, (float)Center.X - Radius - 15, (float)Center.Y - Radius - 15, Radius * 2 + 30, Radius * 2 + 30);
}
}
--
Gitblit v1.8.0