From b62f5f0104845c2a3a74707792ebf28a506e24f1 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期一, 17 六月 2024 02:21:26 +0800
Subject: [PATCH] core升级
---
Hydraulic/Hydro.MapUI/Map/MapViewer.cs | 346 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 256 insertions(+), 90 deletions(-)
diff --git a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
index 75b3871..7944737 100644
--- a/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
+++ b/Hydraulic/Hydro.MapUI/Map/MapViewer.cs
@@ -1,5 +1,7 @@
锘�//using CloudWaterNetwork.Magnifier;
+//using DevExpress.XtraEditors;
using Hydro.CommonBase;
+using Hydro.Core.Model;
using Hydro.Inp;
//using ConfigApp;
//using DevExpress.Diagram.Core.Layout;
@@ -7,6 +9,7 @@
//using DevExpress.Utils.Extensions;
//using dict_py_Inner;
using Hydro.MapView;
+using Hydro.MapView.Base;
using Hydro.MapView.Common;
using Newtonsoft.Json;
//using ReflectionManager_NameSpace;
@@ -16,20 +19,21 @@
using System.ComponentModel;
using System.Data;
using System.Data.Common;
-using System.Diagnostics;
+//using System.Diagnostics;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Numerics;
using System.Reflection;
using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices.WindowsRuntime;
-using System.Runtime.Remoting.Metadata;
+//using System.Runtime.InteropServices.WindowsRuntime;
+//using System.Runtime.Remoting.Metadata;
using System.Security.Cryptography;
using System.Text;
+using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
-using System.Windows.Forms.DataVisualization.Charting;
+//using System.Windows.Forms.DataVisualization.Charting;
//using static Hydro.Core.ObjectEnum;
using static Hydro.MapView.MapViewEnum;
using static System.Net.Mime.MediaTypeNames;
@@ -102,7 +106,7 @@
// DoubleBuffered = true;
// SetStyle(ControlStyles.SupportsTransparentBackColor, true);
// BackColor = Color.Transparent;
-
+
//}
public MapViewer(bool showToolBar = false)
@@ -110,7 +114,9 @@
this.showToolBar = showToolBar;
InitializeComponent();
-
+ //var propertyForm = new PropertyForm();
+ //propertyForm.Dock = DockStyle.Right;
+ //this.Controls.Add(propertyForm);
MapCenter = PointF.Empty;
zoom = 1.0f;
DoubleBuffered = true;
@@ -119,7 +125,7 @@
//if (!showToolBar) this.panel1.Visible = false;
}
- public MapViewer()
+ public MapViewer()
{
this.showToolBar = false;
@@ -127,17 +133,18 @@
MapCenter = PointF.Empty;
zoom = 1.0f;
-
+
SetStyle(ControlStyles.SupportsTransparentBackColor, true);
BackColor = Color.Transparent;
}
public void SetEditMode(bool isEditMode)
{
- _IsEditMode = isEditMode;
- }
+ _IsEditMode= isEditMode;
+ }
private void MapViewer_Load(object sender, EventArgs e)
{
+ GlobalObject.PropertyForm = this.propertyForm;
this.panel1.Visible = _showToolBar;
this.statusStrip1.Visible = _showStatusBar;
@@ -168,7 +175,61 @@
map.Init(TC,new DrawDelegate[] { Draw, Draw, DrawBackGroud, DrawH },new MouseDelegate[] { mapMouseDown, mapMouseMove, mapMouseUp, mapMouseWheel });
+ TContainer TCCube = new TContainer();
+ TCCube.template = new Template();
+ TCCube.template.network = new MapViewNetWork();
+ TCCube.template.network.Areas = new List<AreaViewModel>();
+ Cube cb=new Cube();
+ foreach (var item in cb.FacesVertices)
+ {
+ AreaViewModel area = new AreaViewModel();
+ area.ID = item.Key.ToString();
+ area.InnerNodes = new List<NodeViewModel>();
+ //area.Name= item.Key.ToString();
+ //6涓潰璁剧疆涓嶄竴鏍风殑棰滆壊
+ switch (item.Key)
+ {
+ case 1:
+ area.color = Color.Red;
+ area.Name = "鍙�";
+ break;
+ case 2:
+ area.color = Color.SkyBlue;
+ area.Name = "宸�";
+ break;
+ case 3:
+ area.color = Color.Green;
+ area.Name = "鍚�";
+ break;
+ case 4:
+ area.color = Color.DarkBlue;
+ area.Name = "鍓�";
+ break;
+ case 5:
+ area.color = Color.Purple;
+ area.Name = "涓�";
+ break;
+ case 6:
+ area.color = Color.Orange;
+ area.Name = "涓�";
+ break;
+ default:
+ area.color = Color.White;
+ break;
+ }
+
+ foreach (var p in item.Value)
+ {
+ NodeViewModel node = new NodeViewModel();
+ node.X = p.X;
+ node.Y = p.Y;
+ node.Elev = p.Z;
+ area.InnerNodes.Add(node);
+ }
+ TCCube.template.network.Areas.Add(area);
+ }
+ CubeView.Init(TCCube, new DrawDelegate[] { Draw, Draw, DrawBackGroud, DrawH }, new MouseDelegate[] { mapMouseDown, mapMouseMove, mapMouseUp, mapMouseWheel });
}
@@ -179,7 +240,7 @@
public bool LoadData(bool isDelCache = false)
{
-
+
if (_Template == null) return false;
if (isDelCache || _Template.network == null)
{
@@ -256,7 +317,7 @@
bool reLoad = _Template == template;
this._Template = template;
this._ViewModel = viewMode;
-
+
//if ( _Template?.Floors!=null)
//{
@@ -299,7 +360,7 @@
SetMapInvalidate();
}
}
-
+
鍒锋柊妤煎眰ToolStripMenuItem_Click(1, new EventArgs());
label_center.Text = $"center锛�({MapCenter.X.ToString("0.00")} 锛寋MapCenter.Y.ToString("0.00")}锛�";
label_zoom.Text = $"Zoom锛歿zoom.ToString("0.000")}";
@@ -381,8 +442,8 @@
#region 閲嶇粯鍑芥暟
- bool _needPaintAll
- {
+ bool _needPaintAll
+ {
get
{
return __needpaintall;
@@ -392,6 +453,7 @@
__needpaintall = value;
}
}
+
PointF[] getCurclePoints(int num)
{
@@ -408,17 +470,18 @@
return points;
}
+
+
-
-
-
-
+
+
private void timer_draw_Tick(object sender, EventArgs e)
{
_mouseHoverCheckFlag = true;
if (_timerDraw && map.Status==DrawingStatus.Ready)
{
this.map.Invalidate();
+ this.CubeView.Invalidate();
_timerDraw = false;
}
@@ -437,13 +500,13 @@
#region 榧犳爣浜嬩欢
-
+
void mapMouseDown(MouseEventArgs e)
{
base.OnMouseDown(e);
_ClickStartPos = new PointF(e.X, e.Y);
- DragStartPos = ScreenToMap(new PointF(e.X, e.Y));
+ DragStartPos= ScreenToMap(new PointF(e.X, e.Y));
mousePosition = _MousePosition = ScreenToMap(new PointF(e.X, e.Y));
if (e.Button == MouseButtons.Left && _isInsertingObject)
{
@@ -624,7 +687,7 @@
// Math.Abs((int)DragStartPos.Y - (int)MP.Y));
//DrawSelectionRect(selectionRect);
needInvalidate = true;
-
+
}
else if (_isRotating)
{
@@ -658,7 +721,7 @@
// 閬嶅巻鎵�鏈夊璞�,鎵惧嚭鑼冨洿鍐呯殑瀵硅薄
PointF clickedPoint = new PointF(e.X, e.Y); //ScreenToMap(new PointF(e.X, e.Y));
var obj = GetObj_by_ScreenPoint(clickedPoint);
- if (hoveredObjs.Count > 0 && hoveredObjs[0] == obj || hoveredObjs.Count == 0 && obj == null)
+ if (hoveredObjs.Count > 0 && hoveredObjs[0] == obj || hoveredObjs.Count==0 && obj==null)
{
//needInvalidate = false;
}
@@ -667,18 +730,18 @@
needInvalidate = true;
hoveredObjs.ForEach(o => o.Hovered = false);
hoveredObjs.Clear();
- if (obj != null)
+ if (obj!=null)
{
obj.Hovered = true;
hoveredObjs.Add(obj);
}
-
-
+
+
}
-
+
}
-
+
if (needInvalidate) this.SetMapInvalidate();
@@ -882,12 +945,10 @@
-
_newTemplate.network = net0;
_isInsertingObject = true;
_undoOldValue = new PointF3D(0, 0, 0);
_OperaNode = _newTemplate.network.Nodes.Find(node => node.ID == _newTemplate.Node1) as NodeViewModel;
-
SetMapInvalidate();
return;
@@ -928,6 +989,8 @@
NodeViewModel minNode = null;
foreach (NodeViewModel node in nodes)
{
+
+
PointF mapPos = WorldPointToMapPoint(node);
PointF currentPoint = MapToScreen(mapPos);
float currentDist = 0;
@@ -956,7 +1019,7 @@
var l = new List<IBaseViewModel>();
l.Add(_Network.AddPipe(_OperaNode, minNode));
if (l.Count > 0) MapObjectExtensions.AddCommand(_Network, "Add", null, l);
-
+
_OperaNode = null;
_NewNet.Clear();
}
@@ -1031,7 +1094,7 @@
case MouseState.鏂板缓閲嶅鍣�:
if (_select_junction1 == null)
{
- if (_mouseState == MouseState.鏂板绔嬬)
+ if (_mouseState==MouseState.鏂板绔嬬)
{
var m = ScreenToVMap(new PointF(e.X, e.Y));
z = m.Y;
@@ -1043,19 +1106,19 @@
getPointAndHeight(e, out p, out z);
Set_junction1(e);
}
-
+
}
else
{
if (_mouseState == MouseState.鏂板绔嬬)
{
//闇�瑕佹妸榧犳爣浣嶇疆杞崲涓虹珛绠＄殑浣嶇疆锛岃幏鍙栭紶鏍囦綅缃殑楂樼▼
-
+
var wPos = GetZZWorldPoint(_select_junction1.Position3D, _MousePosition, new Vector3(0, 0, 1));
//var m = ScreenToVMap(new PointF(e.X, e.Y));
//z = m.Y;
p = new PointF(wPos.X, wPos.Y);
- var l = AddLink(new PointF(e.X, e.Y), isdoubleClick, p, wPos.Z);
+ var l = AddLink(new PointF( e.X,e.Y), isdoubleClick, p, wPos.Z);
if (l.Count > 0) MapObjectExtensions.AddCommand(_Network, "Add", null, l);
}
else
@@ -1070,14 +1133,14 @@
}
else
{
- getPointAndHeight(e, _select_junction1, out p, out z);
- var l = AddLink(new PointF(e.X, e.Y), isdoubleClick, p, z);
+ getPointAndHeight(e, _select_junction1, out p, out z);
+ var l = AddLink(new PointF(e.X, e.Y), isdoubleClick, p,z);
if (l.Count > 0) MapObjectExtensions.AddCommand(_Network, "Add", null, l);
}
-
+
}
-
+
}
break;
}
@@ -1345,11 +1408,11 @@
if (!isMouseMoved)
{
鍙抽敭_Menu.Show(this, e.Location);
-
- 杞崲涓篢oolStripMenuItem.Enabled = selectedNodes.Count > 0; //(selectedObjs.Count == 1);
+
+ 杞崲涓篢oolStripMenuItem.Enabled = selectedNodes.Count > 0; //(selectedObjs.Count == 1);
鍒犻櫎ToolStripMenuItem.Enabled = selectedObjs.Count > 0;
鍒犻櫎ToolStripMenuItem1.Enabled = selectedObjs.Count > 0;
-
+
}
if (recordView) MapObjectExtensions.AddCommand(mapOption, "Map", mapOption0, mapOption);
@@ -1390,7 +1453,7 @@
IBaseViewModel GetObj_by_ScreenPoint(PointF clickedPoint, float DistLimit = 15f)
{
float minDist = float.MaxValue;
-
+
int minIndex = -1;
bool isJunction = true;
IBaseViewModel obj = null;
@@ -1439,9 +1502,9 @@
float minDist = float.MaxValue;
int minIndex = -1;
-
+
IBaseViewModel obj = null;
- List<IBaseViewModel> objs = new List<IBaseViewModel>();
+ List < IBaseViewModel > objs = new List<IBaseViewModel>();
for (int i = 0; i < _Nodes.Count; i++)
{
var node = _Nodes[i] as NodeViewModel;
@@ -1470,7 +1533,7 @@
//float dist = Get_dist(clickedPoint, currentPoint);
if (dist < minDist && dist <= DistLimit)
{
-
+
objs.Add(link);
}
@@ -1576,10 +1639,10 @@
}
private void 榛樿瑙嗚ToolStripMenuItem_Click(object sender, EventArgs e)
{
-
+
mapOption0 = mapOption.Copy();
-
+
InitCenter();
RotationF = 45;
Rotation = -45;
@@ -1702,8 +1765,8 @@
{
_Template = new Template();
_Template.network = new MapViewNetWork();
-
-
+
+
//_Template.network.use_old = false;
// 鑾峰彇閫変腑鏂囦欢鐨勬枃浠惰矾寰�
string filePath = openFileDialog.FileName;
@@ -1743,7 +1806,7 @@
{
if (_filePath == null) return;
FileInfo fi = new FileInfo(_filePath);
- Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
+ System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
//System.Diagnostics.Process.Start("explorer.exe", fi.Directory.FullName);
}
private void EPA涓墦寮�ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -1751,7 +1814,7 @@
if (_filePath == null) return;
- Process.Start(@"epanetH\Epanet2wH.exe", _filePath);
+ System.Diagnostics.Process.Start(@"epanetH\Epanet2wH.exe", _filePath);
}
private void 淇濆瓨ToolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -1793,7 +1856,7 @@
#region 缁樺浘宸ュ叿
-
+
public void toolStripButton_鏂板缓鑺傜偣_Click(object sender, EventArgs e)
{
_mouseState = MouseState.鏂板鑺傜偣;
@@ -1860,7 +1923,7 @@
_mouseState = MouseState.鏂板绠＄嚎;
Cursor = Cursors.Cross;
}
- public void toolStripButton_鏂板缓绔嬬_Click(object sender, EventArgs e)
+ public void toolStripButton_鏂板缓绔嬬_Click(object sender,EventArgs e)
{
_mouseState = MouseState.鏂板绔嬬;
Cursor = Cursors.Cross;
@@ -1883,7 +1946,7 @@
l.Add(_select_junction2);
}
- if (_mouseState == MouseState.鏂板绠＄嚎 || _mouseState == MouseState.鏂板绔嬬)
+ if (_mouseState == MouseState.鏂板绠＄嚎 || _mouseState==MouseState.鏂板绔嬬)
l.Add(_Network.AddPipe(_select_junction1, _select_junction2));
else if (_mouseState == MouseState.鏂板缓闃�闂�)
l.Add(_Network.AddValve(_select_junction1, _select_junction2));
@@ -2395,7 +2458,7 @@
private void 缂╂斁ToolStripMenuItem_Click(object sender, EventArgs e)
{
-
+
var objs = GlobalObject.PropertyForm.selectionSet.selectedObjects;
var list = objs.FindAll(o => o is NodeViewModel); //GlobalObject.PropertyForm.listBox1.SelectedItems;
if (list.Count <= 0) return;
@@ -2469,12 +2532,103 @@
}
+ private void btn_鍒濆垎閰峗Click(object sender, EventArgs e)
+ {
+ string result = null;
+ if ((result=_Template.network.CheckValidate())!=null)
+ {
+ MessageBox.Show(result);
+ return;
+ }
+ List<WaterEquivalentSettings> settings = new List<WaterEquivalentSettings>();
+ settings.Add(new WaterEquivalentSettings()
+ {
+ waterEquivalents=new WaterEquivalentTemplate()
+ {
+ ID="1",
+ Name="1",
+ WaterEquivalentCollection=new WaterEquivalentCollection()
+ {
+ new WaterEquivalent()
+ {
+ ID=1008,
+ MinRatedFlow=0.48f,
+ RatedFlow=0.72f,
+ Count=1,
+ },
+ new WaterEquivalent()
+ {
+ ID=1009,
+ MinRatedFlow=0.88f,
+ RatedFlow=0.96f,
+ Count=2,
+ },
+ new WaterEquivalent()
+ {
+ ID=1010,
+ MinRatedFlow=1.08f,
+ RatedFlow=1.08f,
+ Count=3,
+ }
+ }
+ },
+ Meters=new List<string>()
+ {
+ //鎸変互涓嬭寰嬬敓鎴愭暟缁勫埌M10锛�"M1","M2"
+ "M1","M2","M3","M4","M5","M6","M7","M8","M9","M10","M11","M12","M13","M14","M15","M16",
+ "M17","M18","M19","M20","M21","M22","M23","M24","M25","M26","M27","M28","M29","M30"
+ },
+ });
+
+
+ settings.Add(new WaterEquivalentSettings()
+ {
+ waterEquivalents = new WaterEquivalentTemplate()
+ {
+ ID = "1",
+ Name = "1",
+ WaterEquivalentCollection = new WaterEquivalentCollection()
+ {
+ new WaterEquivalent()
+ {
+ ID=2008,
+ MinRatedFlow=0.48f,
+ RatedFlow=0.48f,
+ Count=1,
+ },
+ new WaterEquivalent()
+ {
+ ID=2009,
+ MinRatedFlow=0.12f,
+ RatedFlow=0.12f,
+ Count=5,
+ },
+ new WaterEquivalent()
+ {
+ ID=2010,
+ MinRatedFlow=0.16f,
+ RatedFlow=0.18f,
+ Count=6,
+ }
+ }
+ },
+ Meters = new List<string>()
+ {
+ //鎸変互涓嬭寰嬬敓鎴愭暟缁勫埌M10锛�"M1","M2"
+
+ "M31","M32","M33","M34","M35","M36","M37","M38","M39","M40","M41","M42","M43","M44","M45","M46","M47","M48","M49","M50","M51","M52","M53","M54","M55","M56","M57","M58","M59","M60","M61","M62","M63","M64","M65","M66","M67","M68","M69","M70","M71","M72","M73","M74","M75","M76","M77","M78","M79","M80"
+ },
+ });
+ var head=_Network.reservoirs.FirstOrDefault().Head;
+ _Network.WaterDistribution(_Template.FullPath, GlobalPath.configPath + "config_waterDistri.wdb",settings,40, head);
+
+ }
public void toolStripButton_璁＄畻_Click(object sender, EventArgs e)
{
//LoadData();
- _Network.Calc(_Template.FullPath, GlobalPath.configPath + "config_calc.wdb");
+ _Network.Calc(_Template.FullPath, GlobalPath.configPath+ "config_calc.wdb");
}
public void 鍏抽榾鎼滅储ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -2750,7 +2904,7 @@
// }
//}
- private void TraversePipeNetworkALL(LinkViewModel startLink, HashSet<NodeViewModel> visitedNodes = null, int direction = 0)
+ private void TraversePipeNetworkALL(LinkViewModel startLink, HashSet<NodeViewModel> visitedNodes = null,int direction=0)
{
Queue<LinkViewModel> queue = new Queue<LinkViewModel>();
@@ -3247,7 +3401,7 @@
{
var objs = selectedObjs.FindAll(o => o is LinkViewModel).Select(o => o as LinkViewModel).ToList();
- if (objs.Count == 0) selectedObjs.FindAll(o => o is NodeViewModel).Select(o => o as NodeViewModel).ToList().ForEach(o => objs.AddRange(o.Links.Select(l => l as LinkViewModel).ToList()));
+ if (objs.Count == 0) selectedObjs.FindAll(o => o is NodeViewModel).Select(o => o as NodeViewModel).ToList().ForEach(o=>objs.AddRange(o.Links.Select(l=>l as LinkViewModel).ToList()));
//objs鍘绘帀閲嶅鐨勫厓绱�
objs = objs.Distinct().ToList();
var visitedNodes = new HashSet<NodeViewModel>();
@@ -3264,21 +3418,21 @@
{
var objs = selectedObjs.FindAll(o => o is LinkViewModel).Select(o => o as LinkViewModel).ToList();
- if (objs.Count == 0) selectedObjs.FindAll(o => o is NodeViewModel).Select(o => o as NodeViewModel).ToList().ForEach(o =>
+ if (objs.Count == 0) selectedObjs.FindAll(o => o is NodeViewModel).Select(o => o as NodeViewModel).ToList().ForEach(o =>
{
- objs.AddRange(o.Links.Select(oo => oo as LinkViewModel).ToList().FindAll(oo => oo.StartNode == o ? oo.EN_FLOW > 0 : oo.EN_FLOW < 0));
+ objs.AddRange(o.Links.Select(oo => oo as LinkViewModel).ToList().FindAll(oo=>oo.StartNode==o?oo.EN_FLOW>0:oo.EN_FLOW<0));
});
//objs鍘绘帀閲嶅鐨勫厓绱�
objs = objs.Distinct().ToList();
var visitedNodes = new HashSet<NodeViewModel>();
- objs.ForEach(o => TraversePipeNetworkALL(o, visitedNodes, 1));
+ objs.ForEach(o => TraversePipeNetworkALL(o, visitedNodes,1));
this.SetMapInvalidate();
}
}
public void 澶嶅埗ToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (hoveredObjs.Count <= 0 || !(hoveredObjs[0] is NodeViewModel))
+ if(hoveredObjs.Count<=0 || !(hoveredObjs[0] is NodeViewModel))
{
MessageBox.Show("璇峰皢榧犳爣鎮仠鍦ㄤ竴涓妭鐐瑰璞′笂,浣滀负鍩哄噯鐐�");
return;
@@ -3288,7 +3442,7 @@
MessageBox.Show("璇烽�夋嫨瑕佸鍒剁殑瀵硅薄");
return;
}
-
+
_OperaNode = hoveredObjs[0] as NodeViewModel;
MapViewNetWork net = new MapViewNetWork();
@@ -3313,13 +3467,13 @@
public void 绮樿创ToolStripMenuItem1_Click(object sender, EventArgs e)
{
{
-
+
var net = new MapViewNetWork();
string json = Clipboard.GetText();
net.ReadFromJson(json);
if (net.StartPoint == null) return;
string SID = net.StartPoint.ID;
- net.StartPoint = net.Nodes.Find(n => n.ID == SID);
+ net.StartPoint=net.Nodes.Find(n => n.ID == SID);
PointF3D minPoint = net.StartPoint.Position3D;// new PointF(net.StartPoint.X, net.StartPoint.Y);
Point controlLocation = this.PointToScreen(new Point(0, 0));
int offsetX = Cursor.Position.X - controlLocation.X;
@@ -3329,9 +3483,9 @@
net.BuildRelation();
//var basePoint = MapPointToWorldPoint(ScreenToMap(position, net.StartPoint.Elev), net.StartPoint.Elev);
var mPos = _MousePosition;
- if (hoveredObjs.Count > 0 && hoveredObjs[0] is NodeViewModel minNode)
+ if (hoveredObjs.Count>0 && hoveredObjs[0] is NodeViewModel minNode)
{
-
+
var basePoint = minNode.Position3D;
net.Nodes.ForEach(obj =>
{
@@ -3339,12 +3493,12 @@
obj.Y = obj.Y + basePoint.Y - minPoint.Y;
obj.Elev = obj.Elev + basePoint.Z - minPoint.Z;
});
-
+
selectedObjs.ForEach(o => o.Selected = false);
selectedObjs.Clear();
selectedObjs.AddRange(net.Nodes.Select(n => (NodeViewModel)n));
selectedObjs.AddRange(net.Links.ViewLinks);
- var list = _Network.Add(net, null, false, minNode);
+ var list = _Network.Add(net,null,false,minNode);
net.BuildRelation();
//list.Add(_Network.AddPipe(Snode, minNode));
MapObjectExtensions.AddCommand(_Network, "Add", null, list);
@@ -3368,7 +3522,7 @@
SetMapInvalidate();
}
-
+
}
}
private void 澧為噺淇濆瓨ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -3395,7 +3549,7 @@
}
private void 璁句负鍏抽棴ToolStripMenuItem_Click(object sender, EventArgs e)
{
- selectedObjs.ForEach(obj => { if (obj is LinkViewModel link) link.Status = Hydro.Core.ObjectEnum.StatusType.CLOSED; });
+ selectedObjs.ForEach(obj => { if (obj is LinkViewModel link) link.Status =Hydro.Core.ObjectEnum. StatusType.CLOSED; });
SetMapInvalidate();
}
private void 鏄剧ず鍏ㄩ儴妤煎眰ToolStripMenuItem_Click(object sender, EventArgs e)
@@ -3517,7 +3671,7 @@
{
var backgroundImagePath = openFileDialog.FileName;
Global.ClearFileReadOnly(_Template.BackGroundImg_FullPath);
- File.Copy(backgroundImagePath, _Template.BackGroundImg_FullPath, true);
+ FileCopy.Copy(backgroundImagePath, _Template.BackGroundImg_FullPath, true);
璁剧疆搴曞浘ToolStripMenuItem_Click(1, new EventArgs());
}
}
@@ -3575,13 +3729,13 @@
{
if (_filePath == null) return;
FileInfo fi = new FileInfo(_filePath);
- Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
+ System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
}
private void label_file_Click(object sender, EventArgs e)
{
if (_filePath == null) return;
FileInfo fi = new FileInfo(_filePath);
- Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
+ System.Diagnostics.Process.Start("explorer.exe", $"/select,\"{_filePath}\"");
}
private void 璁句负绔嬬鐐筎oolStripMenuItem_Click(object sender, EventArgs e)
{
@@ -3709,11 +3863,11 @@
string tagstring = i.ToString() + "妤�";
if (tags.Contains(tagstring))
{
- var item = ToolStripMenuItem_Floor.DropDownItems.Add(i.ToString() + "妤�");
+ var item=ToolStripMenuItem_Floor.DropDownItems.Add(i.ToString() + "妤�");
item.Click += (oo, ee) =>
{
-
-
+
+
mapobjects.ForEach(o =>
{
if (o.Tags.Contains(tagstring))
@@ -3752,32 +3906,44 @@
{
_isShowDirection = !_isShowDirection;
}
- bool _isShowDirection = false;
+ bool _isShowDirection=false;
private void 棰滆壊鍒嗙骇绠＄悊ToolStripMenuItem_Click(object sender, EventArgs e)
{
Form_Colour form_Colour = new Form_Colour(_Template.Colours,_Template);
form_Colour.Show(this);
}
+
+ private bool __needpaintall=false;
+
- private bool __needpaintall = false;
-
-
-
+
private void cb_Link_Colour_SelectedIndexChanged(object sender, EventArgs e)
{
if (_Template == null) return;
-
var type = cb_Link_Colour.SelectedItem == null ? ColourType.绠＄嚎娴侀噺 : (ColourType)cb_Link_Colour.SelectedItem;
- mapOption.ColourLink = type;
+ var doubles = _Template.network.getMinMax(type);
+ var colour = new Colour(type, null, type.ToString());
+ List<ColourItem> colours = Colour.GetColourItems((float)doubles[0], (float)doubles[1], 5, Color.Gray, Color.Red);
+ colour.Items = colours;
+ LinkColour = colour;
this.SetMapInvalidate();
+
+
+
}
private void cb_Node_Colour_SelectedIndexChanged(object sender, EventArgs e)
{
if (_Template == null) return;
-
var type = cb_Node_Colour.SelectedItem == null ? ColourType.鑺傜偣鑷敱鍘嬪姏 : (ColourType)cb_Node_Colour.SelectedItem;
- mapOption.ColourNode = type;
+ var doubles = _Template.network.getMinMax(type);
+ var colour = new Colour(type, null, type.ToString());
+ List<ColourItem> colours = Colour.GetColourItems((float)doubles[0], (float)doubles[1], 5, Color.Gray, Color.Red);
+ colour.Items = colours;
+ NodeColour = colour;
this.SetMapInvalidate();
+
+
+
}
private void label_ZZ_Click(object sender, EventArgs e)
@@ -3788,7 +3954,7 @@
private void 妤煎眰绠＄悊ToolStripMenuItem_Click(object sender, EventArgs e)
{
- if (_Template.Regions == null)
+ if (_Template.Regions==null)
{
_Template.Regions = new List<TRegion>();
}
@@ -3796,9 +3962,9 @@
form_EditFloors.Show(this);
}
+
-
-
+
#endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3