From dfe7e1653f8309e23e4c314cd58ac4ff7ce49dbc Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:50:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs | 43 +++++++++++++++++++++----------------------
1 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs
index ef06c2e..f9edc1c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs
@@ -1,28 +1,27 @@
-锘縰sing Yw.WinFrmUI.Q3d;
+锘縰sing Newtonsoft.Json;
//using Hydro.Inp;
using Newtonsoft.Json.Linq;
-using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Numerics;
+using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using static Yw.WinFrmUI.Q3d.ObjectEnum;
-
-using static Yw.WinFrmUI.Q3d.MapViewEnum;
+using System.Xml.Linq;
using Yw.WinFrmUI.Q3d;
-using System.Runtime.InteropServices;
+using Yw.WinFrmUI.Q3d;
//using Hydro.HydraulicOptimizer;
using Yw.WinFrmUI.Q3d;
-using System.Xml.Linq;
+using static Yw.WinFrmUI.Q3d.MapViewEnum;
+using static Yw.WinFrmUI.Q3d.ObjectEnum;
namespace Yw.WinFrmUI.Q3d
{
[Serializable]
- public partial class NetworkViewModel
+ public partial class NetworkViewModel
{
bool use_old = false;
public string Name;
@@ -697,21 +696,21 @@
#endregion
-
+
}
//鏋勯�犱竴涓狶ist<LinkViewModel>绫伙紝鑳藉瀹炵幇List鐨勬墍鏈夊姛鑳�
[Serializable]
- public class LinkViewModelList:List<Q3DLinkCalcModel>
+ public class LinkViewModelList : List<LinkViewModel>
{
-
+
Dictionary<string, LinkViewModel> dict;
public LinkViewModelList() : base()
{
this.dict = new Dictionary<string, LinkViewModel>();
}
-
+
public List<LinkViewModel> ViewLinks
{
get
@@ -731,7 +730,7 @@
/// </summary>
public void UpdateDict()
{
- this.dict= new Dictionary<string, LinkViewModel>();
+ this.dict = new Dictionary<string, LinkViewModel>();
base.ForEach(link =>
{
if (!dict.ContainsKey(link.ID))
@@ -743,13 +742,13 @@
/// </summary>
/// <param name="oldID"></param>
/// <param name="newID"></param>
- public void ChangeID(string oldID,string newID)
+ public void ChangeID(string oldID, string newID)
{
if (dict.ContainsKey(oldID))
{
dict[oldID].ID = newID;
dict.Add(newID, dict[oldID]);
- dict.Remove(oldID);
+ dict.Remove(oldID);
}
}
/// <summary>
@@ -774,7 +773,7 @@
dict.Add(link.ID, link);
});
}
-
+
public bool RemoveAt(int index)
{
if (index < 0 || index >= base.Count) return false;
@@ -794,7 +793,7 @@
{
if (dict.ContainsKey(ID))
return dict[ID];
- else
+ else
return (LinkViewModel)base.Find(l => l.ID == ID);
}
}
@@ -866,13 +865,13 @@
//鏋勯�犱竴涓狶ist<NodeViewModel>绫伙紝鑳藉瀹炵幇List鐨勬墍鏈夊姛鑳�
[Serializable]
- public class NodeViewModelList : List<Q3DNodeCalcModel>
+ public class NodeViewModelList : List<NodeViewModel>
{
//List<NodeCalcModel> base;
- Dictionary<string, Q3DNodeCalcModel> dict;//=new Dictionary<string, NodeCalcModel>();//
- public NodeViewModelList():base()
+ Dictionary<string, NodeViewModel> dict;//=new Dictionary<string, NodeCalcModel>();//
+ public NodeViewModelList() : base()
{
- this.dict = new Dictionary<string, Q3DNodeCalcModel>();
+ this.dict = new Dictionary<string, NodeViewModel>();
}
//public NodeViewModelList(List<NodeCalcModel> nodes)
//{
@@ -888,7 +887,7 @@
/// </summary>
public void UpdateDict()
{
- this.dict = new Dictionary<string, Q3DNodeCalcModel>();
+ this.dict = new Dictionary<string, NodeViewModel>();
base.ForEach(node =>
{
if (!dict.ContainsKey(node.ID))
--
Gitblit v1.9.3