From a15bf1762569323ebf47dd094b0f79b33829e76f Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期二, 21 五月 2024 12:53:09 +0800
Subject: [PATCH] 优化template对象,public方法

---
 Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs
index ce8dc52..7db7088 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs
@@ -117,9 +117,9 @@
                     var p1 = WorldPointToMapPoint(link.StartNode, template.OffSet);
                     var p2 = WorldPointToMapPoint(link.EndNode, template.OffSet);
                     if (!isVisible(p1) && !isVisible(p2)) continue;
-                    if (_LinkColour != null)
+                    if (LinkColour != null)
                     {
-                        pen0.Color = penClosed.Color = GraphHelper.getLinkColor(_LinkColour, link);
+                        pen0.Color = penClosed.Color = GraphHelper.getLinkColor(LinkColour, link);
                     }
 
                     Pen pen = pen0;
@@ -363,9 +363,9 @@
                     dict_point.Add(ps_20);
                     //var x = junction.Position.X * zoom + PanningOffset.X - radius / 2.0f;
                     //var y = junction.Position.Y * zoom + PanningOffset.Y - radius / 2.0f;
-                    if (_NodeColour != null)
+                    if (NodeColour != null)
                     {
-                        pen.Color = penChoosed.Color = GraphHelper.getNodeColor(_NodeColour, node);
+                        pen.Color = penChoosed.Color = GraphHelper.getNodeColor(NodeColour, node);
                         brush = pen.Brush;
                         brushChoosed = penChoosed.Brush;
 
@@ -509,9 +509,9 @@
                     dict_point.Add(ps_20);
                     //var x = junction.Position.X * zoom + PanningOffset.X - radius / 2.0f;
                     //var y = junction.Position.Y * zoom + PanningOffset.Y - radius / 2.0f;
-                    if (_NodeColour != null)
+                    if (NodeColour != null)
                     {
-                        pen.Color = GraphHelper.getNodeColor(_NodeColour, node);
+                        pen.Color = GraphHelper.getNodeColor(NodeColour, node);
                         brush = pen.Brush;
                         brushChoosed = penChoosed.Brush;
 
@@ -871,7 +871,7 @@
         /// <param name="point"></param>
         /// <param name="z"></param>
         /// <returns></returns>
-        private PointF MapPointToWorldPoint(PointF point, float z = 0)
+        public PointF MapPointToWorldPoint(PointF point, float z = 0)
         {
             var pointT = Get淇瑙掕繕鍘烶oint(point, z);
             pointT = Get骞抽潰杩樺師Point(pointT);

--
Gitblit v1.9.3