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/CrossHairWithAngle.cs | 50 ++++++--------------------------------------------
1 files changed, 6 insertions(+), 44 deletions(-)
diff --git a/src/Bro.UI.Model.Winform/Element/CrossHairWithAngle.cs b/src/Bro.UI.Model.Winform/Element/CrossHairWithAngle.cs
index 60f3e5c..2f54570 100644
--- a/src/Bro.UI.Model.Winform/Element/CrossHairWithAngle.cs
+++ b/src/Bro.UI.Model.Winform/Element/CrossHairWithAngle.cs
@@ -133,44 +133,6 @@
#endregion
#region ElementBase
- //private void CenterPoint_PropertyChanged(object sender, PropertyChangedEventArgs e)
- //{
- // SetNormalPen();
- //}
-
- //protected override void SetNormalPen()
- //{
- // if (CenterPoint.IsBasePoint)
- // {
- // HalfRectangleSize = 20;
- // HalfLength = 80;
-
- // Pen = new Pen(Color.DarkGreen, 1);
- // }
- // else
- // {
- // HalfRectangleSize = 10;
- // HalfLength = 30;
-
- // base.SetNormalPen();
- // }
- //}
-
- public override void Calculate(string imagePath)
- {
- //throw new NotImplementedException();
- }
-
- public override void Calculate(Bitmap image)
- {
- //throw new NotImplementedException();
- }
-
- public override void Calculate(IntPtr imagePtr, int ptrSize, int imageWidth, int imageHeight)
- {
- //throw new NotImplementedException();
- }
-
public override object Clone()
{
//throw new NotImplementedException();
@@ -179,18 +141,18 @@
public override void Draw(Graphics g)
{
- g.DrawRectangle(Pen, ImagePoint.X - HalfRectangleSize, ImagePoint.Y - HalfRectangleSize, HalfRectangleSize * 2, HalfRectangleSize * 2);
+ g.DrawRectangle(Pen, (float)ImagePoint.X - HalfRectangleSize, (float)ImagePoint.Y - HalfRectangleSize, HalfRectangleSize * 2, HalfRectangleSize * 2);
- g.DrawLine(Pen, ImagePoint.X, ImagePoint.Y - HalfLength, ImagePoint.X, ImagePoint.Y + HalfLength);
- g.DrawLine(Pen, ImagePoint.X - HalfLength, ImagePoint.Y, ImagePoint.X + HalfLength, ImagePoint.Y);
+ g.DrawLine(Pen, (float)ImagePoint.X, (float)ImagePoint.Y - HalfLength, (float)ImagePoint.X, (float)ImagePoint.Y + HalfLength);
+ g.DrawLine(Pen, (float)ImagePoint.X - HalfLength, (float)ImagePoint.Y, (float)ImagePoint.X + HalfLength, (float)ImagePoint.Y);
Pen arrowPen = new Pen(Pen.Color, Pen.Width + 3.5f);
arrowPen.StartCap = System.Drawing.Drawing2D.LineCap.AnchorMask;
arrowPen.EndCap = System.Drawing.Drawing2D.LineCap.ArrowAnchor;
- g.DrawLine(arrowPen, ImagePoint.X, ImagePoint.Y, ImagePoint.X + (float)(HalfLength * Math.Cos(Angle * Math.PI / 180.0)), ImagePoint.Y - (float)(HalfLength * Math.Sin(Angle * Math.PI / 180.0)));
+ g.DrawLine(arrowPen, (float)ImagePoint.X, (float)ImagePoint.Y, (float)ImagePoint.X + (float)(HalfLength * Math.Cos(Angle * Math.PI / 180.0)), (float)ImagePoint.Y - (float)(HalfLength * Math.Sin(Angle * Math.PI / 180.0)));
string info = $"{Index} 鍥惧儚鍧愭爣:{ImagePoint.X},{ImagePoint.Y}\r\n鏈哄彴鍧愭爣锛歿PlatPoint.X},{PlatPoint.Y}\r\n瑙掑害锛歿Angle}";
- g.DrawString(info, new Font("NewRoman", FontSize), new SolidBrush(Pen.Color), new PointF(ImagePoint.X + FontDistance, ImagePoint.Y + FontDistance));
+ g.DrawString(info, Font, new SolidBrush(Pen.Color), new PointF((float)ImagePoint.X + FontDistance, (float)ImagePoint.Y + FontDistance));
}
public override bool IsMouseHover(Point p)
@@ -212,7 +174,7 @@
return rect.IntersectsWith(BaseRectangle);
}
- public override void CalculateBaseRectangle()
+ public void CalculateBaseRectangle()
{
BaseRectangle = new Rectangle(new Point((int)ImagePoint.X - HalfRectangleSize, (int)ImagePoint.Y - HalfRectangleSize), new Size(HalfRectangleSize * 2, HalfRectangleSize * 2));
}
--
Gitblit v1.8.0