From 0d59c0b8d03e8485f7938c95ab6d7303d4b1a329 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 05 八月 2024 15:32:27 +0800
Subject: [PATCH] 错误修改
---
WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.Draw.cs | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.Draw.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.Draw.cs
index 25c5a7c..572d1b5 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.Draw.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.Draw.cs
@@ -1,4 +1,4 @@
-锘縰sing DevExpress.XtraPrinting.Native;
+锘�
@@ -130,7 +130,7 @@
void DrawBackGroud(Graphics bufferG, Settings template)
{
if (template == null) return;
-
+
var _Nodes = _network.Nodes.ViewNodes;
var _Links = _network.Links.ViewLinks;
@@ -372,7 +372,7 @@
float radius = 5 * r;
float diameter = radius * 2;
#region 鍦嗗舰鎷嗗垎
-
+
List<PointF> p = new List<PointF>();
Cpoints.ForEach(cp => p.Add(GraphHelper.getRotatePoint(c.X + cp.X * radius - radius, c.Y + cp.Y * radius, c, p1, p2)));
@@ -382,7 +382,7 @@
bufferG.FillPolygon(link.Selected ? pen_valveChoosed.Brush : pen.Brush, p.ToArray());
-
+
// 缁樺埗杩炴帴绾�
@@ -511,7 +511,7 @@
break;
}
if (zoomAtMin >= zoom) continue;
-
+
if (node == _OperaNode)
{
//bufferG.DrawEllipse(junction.Choosed ? penChoosed : pen, rectangle);
@@ -547,7 +547,7 @@
p2 = new PointF(p1.X + 6 * pr, p1.Y - 6 * pr);
bufferG.DrawLine(node.Selected ? penChoosed : pen, p1, p2);
-
+
}
else if (node is TankViewModel)
{
@@ -803,8 +803,8 @@
// 鏍规嵁鏃嬭浆瑙掑害璁＄畻鏃嬭浆鍚庣殑鍧愭爣
private PointF Get骞抽潰鏃嬭浆Point(PointF p, PointF MapC)
{
-
- PointF center = MapC ;
+
+ PointF center = MapC;
double radian = Rotation * Math.PI / 180; // 瑙掑害杞姬搴�
float x = (float)(Math.Cos(radian) * (p.X - center.X) - Math.Sin(radian) * (p.Y - center.Y) + center.X);
float y = (float)(Math.Sin(radian) * (p.X - center.X) + Math.Cos(radian) * (p.Y - center.Y) + center.Y);
@@ -991,7 +991,7 @@
/// <returns></returns>
public PointF MapPointToWorldPoint(PointF point, float z = 0)
{
- var pointT = Get淇瑙掕繕鍘烶oint(point, z,MapCenter);
+ var pointT = Get淇瑙掕繕鍘烶oint(point, z, MapCenter);
pointT = Get骞抽潰杩樺師Point(pointT, MapCenter);
//var n=new PointF((float)pointR.X - Z(z).X, (float)(pointR.Y - Z(z).Y));
@@ -1011,7 +1011,7 @@
#endregion
#region 璁＄畻涓夌淮鐩告満
- public PointF3D GetCameraPosition( float distance=1)
+ public PointF3D GetCameraPosition(float distance = 1)
{
// 灏嗚搴﹁浆鎹负寮у害
float rotationRadians = (float)Rotation * (float)Math.PI / 180;
@@ -1035,7 +1035,7 @@
{
case "宸�":
//Rotation涓�0~180鏃舵樉绀�
- if (RotationF<=90-delta && Rotation >= 0 + delta && Rotation <= 180 - delta)
+ if (RotationF <= 90 - delta && Rotation >= 0 + delta && Rotation <= 180 - delta)
flag = true;
break;
case "鍓�":
@@ -1050,7 +1050,7 @@
break;
case "鍚�":
//Rotation涓�0~180鏃舵樉绀�
- if (RotationF <= 90 - delta && ((Rotation >= 90 + delta && Rotation<=180)||( Rotation>=-180 && Rotation <= -90 - delta)))
+ if (RotationF <= 90 - delta && ((Rotation >= 90 + delta && Rotation <= 180) || (Rotation >= -180 && Rotation <= -90 - delta)))
flag = true;
break;
case "涓�":
@@ -1083,10 +1083,10 @@
// 鍒ゆ柇闈㈡槸鍚︽湞鍚戠浉鏈�
bool isFacingCamera = dotProduct > 0;
- return isFacingCamera;
+ return isFacingCamera;
}
-
+
#endregion
#region 鍒ゆ柇鍙鎬�
--
Gitblit v1.9.3