From 4db7d08bb295be33e80f1353f58fcea4a8da6127 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期一, 10 六月 2024 19:11:39 +0800
Subject: [PATCH] 2024年6月10日
---
Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs | 65 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 18 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs
index 8cdc2b8..a8af967 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.Draw.cs
@@ -21,7 +21,7 @@
partial class MapViewer
{
- void Draw(Graphics bufferG, Template template)
+ void DrawBackGroud(Graphics bufferG,Template template)
{
if (template == null) return;
var _Nodes = template.network.Nodes.ViewNodes;
@@ -34,28 +34,13 @@
float minElve = float.MinValue;
float maxElve = float.MaxValue;
- //if (this.mapOption!=null && this.mapOption.ShowFloor!=int.MinValue )
- //{
- // var fl = template.Floors.Find(f => f.FloorIndex == this.mapOption.ShowFloor);
- // var fl_1 = template.Floors.Find(f => f.FloorIndex == this.mapOption.ShowFloor+1);
- // if (fl!=null)
- // {
- // minElve = fl.Elev;
- // maxElve = fl_1!=null ? fl_1.Elev : float.MaxValue;
- // }
-
- //}
r = r * Link_multiply;
List<PointF> diametersZoom = new List<PointF>() { new PointF(0, 0.08f), new PointF(150, 0.03f), new PointF(300, 0.001f), new PointF(800, 0.0001f) };
Pen penN = new Pen(Color.FromArgb(0, 0, 255), 1 * r);
- Pen penChoosed = new Pen(Color.Purple, 5 * r);
- Pen pen_valveChoosed = new Pen(Color.Red, 5 * r);
-
- Pen penClosed = new Pen(Color.OrangeRed, 2 * r);
- Pen penHovered = new Pen(Color.DeepSkyBlue, 5 * r);
+
//鑳屾櫙鍥剧粯鍒�
if (this.mapOption.isShowPic && template != null && File.Exists(template.BackGroundImg_FullPath))
@@ -138,6 +123,44 @@
//bufferG.Restore(gs);
}
+ }
+
+ void Draw(Graphics bufferG, Template template)
+ {
+ if (template == null) return;
+ var _Nodes = template.network.Nodes.ViewNodes;
+ var _Links = template.network.Links.ViewLinks;
+
+ var Cpoints = getCurclePoints(64).ToList();
+
+ var r = 1.73f / zoom;
+ var rt = r;
+
+ float minElve = float.MinValue;
+ float maxElve = float.MaxValue;
+ //if (this.mapOption!=null && this.mapOption.ShowFloor!=int.MinValue )
+ //{
+ // var fl = template.Floors.Find(f => f.FloorIndex == this.mapOption.ShowFloor);
+ // var fl_1 = template.Floors.Find(f => f.FloorIndex == this.mapOption.ShowFloor+1);
+ // if (fl!=null)
+ // {
+ // minElve = fl.Elev;
+
+ // maxElve = fl_1!=null ? fl_1.Elev : float.MaxValue;
+ // }
+
+ //}
+ r = r * Link_multiply;
+ List<PointF> diametersZoom = new List<PointF>() { new PointF(0, 0.08f), new PointF(150, 0.03f), new PointF(300, 0.001f), new PointF(800, 0.0001f) };
+
+ Pen penN = new Pen(Color.FromArgb(0, 0, 255), 1 * r);
+
+ Pen penChoosed = new Pen(Color.Purple, 5 * r);
+ Pen pen_valveChoosed = new Pen(Color.Red, 5 * r);
+
+ Pen penClosed = new Pen(Color.OrangeRed, 2 * r);
+ Pen penHovered = new Pen(Color.DeepSkyBlue, 5 * r);
+
// 缁樺埗绾�
@@ -723,6 +746,12 @@
return new PointF(worldX, worldY);
}
+ /// <summary>
+ /// 涓栫晫鎶曞奖鍧愭爣杞崲涓哄睆骞曞潗鏍�
+ /// </summary>
+ /// <param name="mapPos"></param>
+ /// <param name="z"></param>
+ /// <returns></returns>
private PointF MapToScreen(PointF mapPos, float z = 0)
{
@@ -789,7 +818,7 @@
return new PointF(x, y);
}
/// <summary>
- /// 鑾峰彇鍦板浘鎶曞奖鍧愭爣
+ /// 鑾峰彇涓栫晫鎶曞奖鍧愭爣
/// </summary>
/// <param name="point"></param>
/// <param name="z"></param>
--
Gitblit v1.9.3