From e2f45c6bce38ee2ffca13510fdf67b00100814cd Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期二, 04 六月 2024 00:18:28 +0800
Subject: [PATCH] [合并]
---
Hydraulic/Hydro.MapView/Base/NodeViewModel.cs | 7 --
Hydraulic/Hydro.MapView/Common/MapDimensions.cs | 9 +-
Hydraulic/Hydro.MapUI/Map/MapViewer.cs | 151 -------------------------------------------------
3 files changed, 7 insertions(+), 160 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
index c1ae3f0..75b3871 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
@@ -165,12 +165,8 @@
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
@@ -396,145 +392,6 @@
__needpaintall = value;
}
}
-<<<<<<< HEAD
-
-=======
- //protected override void OnPaint(PaintEventArgs e)
- //{
- // base.OnPaint(e);
-
- // if (float.IsInfinity(zoom)) return;
-
- // //label_center.Text = $"center锛�({MapCenter.X.ToString("0.00")} 锛寋MapCenter.Y.ToString("0.00")}锛�";
- // //label_zoom.Text = $"Zoom锛歿zoom.ToString("0.000")}";
- // //toolStripStatusLabel_rotation.Text = $"Rotation锛�({Rotation.ToString("0")}锛寋RotationF.ToString("0")})";
-
- // //if (!_needPaintAll)
- // // return;
- // int heightOfBar = showToolBar ? 24 : 0;
- // if (!showToolBar) heightOfBar = 0;
-
-
-
- // if (e.ClipRectangle != new Rectangle(this.Left, heightOfBar, this.map.Width, this.map.Height - heightOfBar - statusStrip1.Height)) return;
-
-
- // _needPaintAll = false;
- // if (buffer == null || buffer.Width != Width || buffer.Height != Height)
- // {
- // buffer?.Dispose();
- // buffer = new Bitmap(Width, Height);
- // }
- // // 浣跨敤缂撳瓨缁樺埗锛岄伩鍏嶅湪姣忔閲嶇粯鏃堕噸鏂拌绠楁墍鏈夎缁樺埗鐨勫厓绱�
-
- // //if (bufferG == null) bufferG = Graphics.FromImage(buffer);
- // using (var bufferG = Graphics.FromImage(buffer))
- // //using (var bufferG = e.Graphics)
- // {
- // // 鍏堝皢鎺т欢鐨勮儗鏅～鍏呬负鐧借壊
- // bufferG.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
- // bufferG.Clear(Color.Transparent);
- // bufferG.TranslateTransform(Width / 2, Height / 2);
- // bufferG.ScaleTransform(Zoom.X, Zoom.Y);
- // bufferG.TranslateTransform(-MapCenter.X, -MapCenter.Y);
-
- // //if (_NodeColour==null)
- // //{
- // // cb_Node_Colour_SelectedIndexChanged(1, new EventArgs());
- // //}
- // //if (_LinkColour==null)
- // //{
- // // cb_Link_Colour_SelectedIndexChanged(1, new EventArgs());
- // //}
- // //BookMark 锛氱粯鍒跺湴鍥句簨浠�
- // Draw(bufferG, _Template);
-
-
-
- // if (_newTemplate?.network != null) Draw(bufferG, _newTemplate);
-
- // var r = 2f / zoom;
- // if (_isDragging && DragStartPos!=new PointF(0,0) && mousePosition!=new PointF(0,0))
- // {
- // label_center.Text = $"S:{DragStartPos.X}:{DragStartPos.Y} E:{mousePosition.X}:{mousePosition.Y}";
- // var _lastMousePosition = DragStartPos;
- // // 缁樺埗鐭╁舰
- // var start = new PointF((float)Math.Min(mousePosition.X, _lastMousePosition.X), (float)Math.Min(mousePosition.Y, _lastMousePosition.Y));
- // var size = new SizeF((float)Math.Abs(_lastMousePosition.X - mousePosition.X), (float)Math.Abs(_lastMousePosition.Y - mousePosition.Y));
- // if (size.Width == 0) size.Width = 0.01f;
- // if (size.Height == 0) size.Height = 0.01f;
- // var rectangle0 = new RectangleF(start, size);
- // using (var pen = new Pen(Color.Black, 0.5f * r))
- // {
- // bufferG.DrawRectangles(pen, new RectangleF[] { rectangle0 });
- // }
- // }
- // if (_isPainting)
- // {
- // if (_mouseState == MouseState.鏂板绔嬬)
- // {
- // var wPos=GetZZWorldPoint(_select_junction1.Position3D, _MousePosition,new Vector3(0,0,1));
- // using (var pen = new Pen(Color.Black, 1 * r))
- // {
- // pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- // bufferG.DrawLine(pen, WorldPointToMapPoint(_select_junction1), WorldPointToMapPoint(wPos));
- // }
- // }
- // else
- // {
- // using (var pen = new Pen(Color.Black, 1 * r))
- // {
- // pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- // bufferG.DrawLine(pen, WorldPointToMapPoint(_select_junction1), _MousePosition);
- // }
- // }
- // }
- // if (_isDrawingPolygon && polygonPoints.Count > 0)
- // {
- // List<PointF> pf = polygonPoints.ToList();
- // pf.Add(new PointF(mousePosition.X, mousePosition.Y));
- // using (var pen = new Pen(Color.Black, 1 * r))
- // {
- // // 缁樺埗澶氳竟褰㈣櫄绾胯竟妗�
- // pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- // bufferG.DrawLines(pen, pf.ToArray());
- // }
- // }
- // if (_isSettingBackGroundPictur)
- // {
-
- // var _lastMousePosition = DragStartPos;
- // // 缁樺埗鐭╁舰
- // var start = new PointF((float)Math.Min(mousePosition.X, _lastMousePosition.X), (float)Math.Min(mousePosition.Y, _lastMousePosition.Y));
- // var size = new SizeF((float)Math.Abs(_lastMousePosition.X - mousePosition.X), (float)Math.Abs(_lastMousePosition.Y - mousePosition.Y));
- // var rectangle0 = new RectangleF(start, size);
- // using (var pen = new Pen(Color.Black, 1 * r))
- // {
- // bufferG.DrawRectangles(pen, new RectangleF[] { rectangle0 });
- // }
- // }
-
- // if (_isMovingObject)
- // {
- // var newP = _MousePosition;
- // //var p = MapPointToWorldPoint(, _OperaNode.Elev);
- // var oldP3D = (PointF3D)_undoOldValue;
- // var oldP = WorldPointToMapPoint(new PointF(oldP3D.X, oldP3D.Y), oldP3D.Z);
- // List<PointF> pf = new List<PointF> { oldP, newP };
- // using (var pen = new Pen(Color.Black, 1 * r))
- // {
- // // 缁樺埗澶氳竟褰㈣櫄绾胯竟妗�
- // pen.DashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- // bufferG.DrawLines(pen, pf.ToArray());
- // }
- // }
-
- // }
- // // 灏嗙敓鎴愮殑鐢诲竷缁樺埗鍒版帶浠朵笂
- // e.Graphics.DrawImage(buffer, 0, 0);
-
- //}
->>>>>>> 0f2ff322746347b91941d936ee27067295e57c76
PointF[] getCurclePoints(int num)
{
@@ -1023,18 +880,14 @@
_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;
diff --git a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
index 576987e..31907f7 100644
--- a/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/NodeViewModel.cs
@@ -108,15 +108,10 @@
public virtual float MaxDiameter { get; set; } = 0;
-<<<<<<< HEAD
+
[Category("2銆佽绠楀弬鏁�")]
- [Description("闇�姘撮噺(m)")]
- [DisplayName("闇�姘撮噺(m)")]
-=======
- [Category("璁＄畻鍙傛暟")]
[Description("闇�姘撮噺(m鲁/h)")]
[DisplayName("闇�姘撮噺(m鲁/h)")]
->>>>>>> 0f2ff322746347b91941d936ee27067295e57c76
[Browsable(true)]
public virtual float Demand { get; set; }
diff --git a/Hydraulic/Hydro.MapView/Common/MapDimensions.cs b/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
index a21649a..c856579 100644
--- a/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
+++ b/Hydraulic/Hydro.MapView/Common/MapDimensions.cs
@@ -57,13 +57,12 @@
[Browsable(true)]
public bool isShowPic { get; set; } = true;
-<<<<<<< HEAD
- [Category("4銆佽瑙�")]
-=======
+
+
public bool isAutoBackgroundImage = false;
- [Category("瑙嗚")]
->>>>>>> 0f2ff322746347b91941d936ee27067295e57c76
+
+ [Category("4銆佽瑙�")]
[DisplayName("鏄剧ず鏈�涓嶅埄鐐�")]
[Browsable(true)]
public bool isShowUnfavor { get; set; } = true;
--
Gitblit v1.9.3