From c2e78e3b0c11026a6374a8dac05c94f65b8c54a6 Mon Sep 17 00:00:00 2001 From: xcd <834800634@qq.com> Date: 星期二, 30 六月 2020 16:22:13 +0800 Subject: [PATCH] 添加IImageSet接口,修改CameraBase图片保存操作。添加Gocator驱动的图片保存操作,gocator图片使用HImage保存 --- src/Bro.UI.Model.Winform/UI/CanvasImage.cs | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Bro.UI.Model.Winform/UI/CanvasImage.cs b/src/Bro.UI.Model.Winform/UI/CanvasImage.cs index e31ebeb..55af243 100644 --- a/src/Bro.UI.Model.Winform/UI/CanvasImage.cs +++ b/src/Bro.UI.Model.Winform/UI/CanvasImage.cs @@ -35,7 +35,7 @@ #region Event public Action<MouseState> OnMouseStateChanged; public Action<IShapeElement> DrawTemplateChanged = null; - public Action<Point, Point> OnMouseLocationUpdated; + public Action<Point, Point, string> OnMouseLocationUpdated; #endregion private MouseState mouseState = MouseState.Normal; @@ -540,7 +540,13 @@ //} //DisplayMouseLocation(e.Location); - OnMouseLocationUpdated?.BeginInvoke(e.Location, ToMapPoint(e.Location), null, null); + Point mapPoint = ToMapPoint(e.Location); + Color color = Color.Transparent; + if (MAP != null && mapPoint.X > 0 && mapPoint.X < MAP.Width && mapPoint.Y > 0 && mapPoint.Y < MAP.Height) + { + color = MAP.GetPixel(mapPoint.X, mapPoint.Y); + } + OnMouseLocationUpdated?.BeginInvoke(e.Location, mapPoint, color.Name, null, null); if (MouseState != MouseState.SelectionZoneDoing) { -- Gitblit v1.8.0