From 252d49eda4ac2b61d0c72ee0c1839779f0ce1d3a Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期二, 04 六月 2024 00:16:10 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.1
---
Hydraulic/Hydro.MapUI/Map/MapViewer.cs | 38 ++++++++++++++++++++++++++++++--------
1 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
index ab90a46..c1ae3f0 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
@@ -165,8 +165,12 @@
cb_Link_Colour.SelectedIndex = 0;
+<<<<<<< HEAD
+ map.Init(TC,new DrawDelegate[] { Draw, Draw, DrawBackGroud, DrawH },new MouseDelegate[] { mapMouseDown, mapMouseMove, mapMouseUp, mapMouseWheel });
+=======
map.Init(TC, new DrawDelegate[] { Draw, Draw, DrawH }, new MouseDelegate[] { mapMouseDown, mapMouseMove, mapMouseUp, mapMouseWheel });
+>>>>>>> 0f2ff322746347b91941d936ee27067295e57c76
@@ -392,6 +396,9 @@
__needpaintall = value;
}
}
+<<<<<<< HEAD
+
+=======
//protected override void OnPaint(PaintEventArgs e)
//{
// base.OnPaint(e);
@@ -527,6 +534,7 @@
// e.Graphics.DrawImage(buffer, 0, 0);
//}
+>>>>>>> 0f2ff322746347b91941d936ee27067295e57c76
PointF[] getCurclePoints(int num)
{
@@ -551,9 +559,12 @@
private void timer_draw_Tick(object sender, EventArgs e)
{
_mouseHoverCheckFlag = true;
- if (_timerDraw)
+ if (_timerDraw && map.Status==DrawingStatus.Ready)
+ {
this.map.Invalidate();
- _timerDraw = false;
+ _timerDraw = false;
+ }
+
}
protected override void OnResize(EventArgs e)
@@ -936,7 +947,8 @@
}
if /*鎻掑叆缁撴瀯*/(e.Button == MouseButtons.Left && _isInsertingObject)
{
- var net = _newTemplate.network;
+ var net = _newTemplate.network;//clone
+ var net0 = _newTemplate.network.DeepCopyByBin<MapViewNetWork>();
List<NodeViewModel> nodes = _Nodes.Select(node => (NodeViewModel)node).ToList();
float minDist = 100f;
NodeViewModel minNode = null;
@@ -961,7 +973,7 @@
var p1 = (PointF3D)_undoOldValue;
var p2 = minNode.Position3D;
- var dd = _newTemplate.OffSet;
+ //var dd = _newTemplate.OffSet;
dx = p2.X - p1.X;
dy = p2.Y - p1.Y;
dz = p2.Z - p1.Z;
@@ -992,7 +1004,7 @@
var list = _Network.Add(net);
var j = _Network.AddPipe(minNode, _OperaNode);
- j.Length = 0.0001f;
+ //j.Length = 0.0001f;
list.Add(j);
_OperaNode = null;
_NewNet.Clear();
@@ -1006,11 +1018,23 @@
selectedObjs.AddRange(list);
MapObjectExtensions.AddCommand(_Network, "Add", null, list);
+
+
+
_isInsertingObject = false;
+<<<<<<< HEAD
+
+
+ _newTemplate.network = net0;
+ _isInsertingObject = true;
+ _undoOldValue = new PointF3D(0, 0, 0);
+ _OperaNode = _newTemplate.network.Nodes.Find(node => node.ID == _newTemplate.Node1) as NodeViewModel;
+=======
//_OperaNode = null;
//_Network.Nodes.AddRange(net.Nodes);
//_Network.Links.AddRange(net.Links);
+>>>>>>> 0f2ff322746347b91941d936ee27067295e57c76
SetMapInvalidate();
return;
@@ -1051,8 +1075,6 @@
NodeViewModel minNode = null;
foreach (NodeViewModel node in nodes)
{
-
-
PointF mapPos = WorldPointToMapPoint(node);
PointF currentPoint = MapToScreen(mapPos);
float currentDist = 0;
@@ -3880,7 +3902,7 @@
bool _isShowDirection = false;
private void 棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem_Click(object sender, EventArgs e)
{
- Form_Colour form_Colour = new Form_Colour(_Template.Colours);
+ Form_Colour form_Colour = new Form_Colour(_Template.Colours,_Template);
form_Colour.Show(this);
}
--
Gitblit v1.9.3