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.cs | 67 ++++++++++++++++-----------------
1 files changed, 33 insertions(+), 34 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.cs
index 8ef1b96..4852c56 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/Map/Map.cs
@@ -1,5 +1,4 @@
-锘縰sing DevExpress.XtraEditors.Filtering;
-using Yw.WinFrmUI.Q3D;
+锘縰sing Yw.WinFrmUI.Q3D;
using Newtonsoft.Json;
using System;
@@ -45,7 +44,7 @@
public Map()
{
-
+
InitializeComponent();
this.DoubleBuffered = true;
MapCenter = PointF.Empty;
@@ -69,7 +68,7 @@
-
+
this.TC = TC;
this.DrawNet = Draw;
@@ -138,7 +137,7 @@
// }
// TCCube.settings.network.Areas.Add(area);
//}
-
+
}
#endregion
@@ -154,10 +153,10 @@
{
_network = new MapViewNetWork();
}
-
+
SuspendLayout();
-
-
+
+
SetStartEndPoint(_Template.Node1, _Template.Node2);
@@ -178,11 +177,11 @@
SetMapInvalidate();
}
-
- public void SetData(MapViewNetWork netWork,Settings template=null)
+
+ public void SetData(MapViewNetWork netWork, Settings template = null)
{
-
+
bool reLoad = _network == netWork;
this._Template = template;
this._network = netWork;
@@ -204,7 +203,7 @@
}
}
-
+
//灏�$"{MapCenter.X.ToString("0.00")},{MapCenter.Y.ToString("0.00")}"閫氳繃CenterChanged浼犲嚭
CenterChanged?.Invoke(this, $"{MapCenter.X.ToString("0.00")},{MapCenter.Y.ToString("0.00")}");
//灏唞oom.ToString("0.000")閫氳繃ZoomChanged浼犲嚭
@@ -558,7 +557,7 @@
if (needInvalidate) this.SetMapInvalidate();
//灏�$"{e.X.ToString("0")},{e.Y.ToString("0")}"閫氳繃MousePositionChanged浼犲嚭
MousePositionChanged?.Invoke(this, $"{_MousePosition.X.ToString("0.00")},{_MousePosition.Y.ToString("0.00")}");
-
+
_lastMouseX = e.X;
_lastMouseY = e.Y;
}
@@ -585,7 +584,7 @@
int doubleClick_Delay = 500;//姣
bool recordView = false;
-
+
void mapMouseUp(MouseEventArgs e)
{
//BookMark 锛氶紶鏍囨姮璧蜂簨浠�
@@ -641,7 +640,7 @@
SetMapInvalidate();
return;
}
-
+
if /*澶氳竟褰㈤�夋嫨*/(_isDrawingPolygon && e.Button == MouseButtons.Left && ModifierKeys == Keys.None)
{
_isDrawingPolygon = false;
@@ -673,7 +672,7 @@
// 缁撴潫缁樺埗澶氳竟褰�
return;
}
-
+
if /*鍙栨秷绉诲姩瀵硅薄*/(_isMovingObject && !isMouseMoved && e.Button == MouseButtons.Left)
{
_isMovingObject = false;
@@ -691,8 +690,8 @@
_NewNet.Clear();
return;
}
-
-
+
+
if /*鍙犲姞妗嗛��*/(isMouseMoved && _mouseState == MouseState.鏃� && e.Button == MouseButtons.Left && ModifierKeys == Keys.Control)
{
@@ -747,7 +746,7 @@
}
}
}
-
+
SelectedObjectsChanged?.Invoke(this, selectedObjs);
SetMapInvalidate();
mousePosition = new PointF(0, 0);
@@ -791,7 +790,7 @@
selectedObjs.Add(link);
}
}
-
+
//灏唖electedObjs閫氳繃SelectedObjectsChanged浼犲嚭
SelectedObjectsChanged?.Invoke(this, selectedObjs);
SetMapInvalidate();
@@ -814,7 +813,7 @@
selectedObjs.Clear();
obj.Selected = true;
selectedObjs.Add(obj);
-
+
SelectedObjectsChanged?.Invoke(this, selectedObjs);
_OperaNode = null;
@@ -1219,7 +1218,7 @@
#region 瑙嗚宸ュ叿
// 鏄剧ず鐐瑰睘鎬�
-
+
double 淇瑙掑害_bak = 45;
private void tool瑙嗚_ButtonClick(object sender, EventArgs e)
{
@@ -1617,7 +1616,7 @@
SetMapInvalidate();
}
-
+
}
@@ -1821,12 +1820,12 @@
}
#endregion
-
-
+
+
#region 鍒嗘瀽宸ュ叿
-
+
public List<PointF> GetRotatedPoints(List<PointF> points, PointF origin, float angle)
{
// 灏嗚搴﹁浆鎹负寮у害
@@ -1963,7 +1962,7 @@
obj.Selected = true;
selectedObjs.Add((LinkViewModel)obj);
});
-
+
SelectedObjectsChanged?.Invoke(this, selectedObjs);
SetMapInvalidate();
}
@@ -1978,7 +1977,7 @@
ResultForm.Controls.Add(listBox1);
ResultForm.MinimizeBox = false;
ResultForm.MaximizeBox = false;
-
+
ResultForm.Show();
}
@@ -1986,12 +1985,12 @@
{
MessageBox.Show("鎷撴墤妫�鏌ラ�氳繃");
}
-
+
}
-
+
List<LinkViewModel> LinksToFindSource = null;
Dictionary<LinkViewModel, List<IBaseViewModel>> Sets = null;
Dictionary<LinkViewModel, bool> Sets_hasSource = null;
@@ -2039,7 +2038,7 @@
}
}
SelectedObjectsChanged?.Invoke(this, selectedObjs);
-
+
}
private void TraversePipeNetwork(LinkViewModel startLink, HashSet<NodeViewModel> visitedNodes = null)
@@ -2107,7 +2106,7 @@
queue.Enqueue(startLink);
if (visitedNodes == null)
visitedNodes = new HashSet<NodeViewModel>();
-
+
Sets.Add(startLink, new List<IBaseViewModel>());
Sets_hasSource.Add(startLink, false);
while (queue.Count > 0)
@@ -2565,7 +2564,7 @@
public void buttonUndo_Click(object sender, EventArgs e)
{
SetMapInvalidate();
-
+
SelectedObjectsChanged?.Invoke(this, null);
MapObjectExtensions.Undo();
}
@@ -2669,7 +2668,7 @@
bool _isSettingBackGroundPictur = false;
-
+
private bool __needpaintall = false;
--
Gitblit v1.9.3