From 22658ee90bd0f8b7b89a6030c2edc7fbf6719c3a Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期四, 02 七月 2020 11:16:25 +0800
Subject: [PATCH] Merge branch 'master' of http://gitblit.broconcentric.com:8088/r/M071
---
src/Bro.UI.Model.Winform/Element/CrossHairWithAngle.cs | 42 ++----------------------------------------
1 files changed, 2 insertions(+), 40 deletions(-)
diff --git a/src/Bro.UI.Model.Winform/Element/CrossHairWithAngle.cs b/src/Bro.UI.Model.Winform/Element/CrossHairWithAngle.cs
index 0ad45e8..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();
@@ -190,7 +152,7 @@
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((float)ImagePoint.X + FontDistance, (float)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