From d4898c5d7e1bbbbba384a0e29f29c066d6f502a7 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期一, 25 十一月 2024 17:44:18 +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 | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs
index f1bf75f..f9edc1c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/NetworkViewModel.cs
@@ -702,7 +702,7 @@
//鏋勯�犱竴涓狶ist<LinkViewModel>绫伙紝鑳藉瀹炵幇List鐨勬墍鏈夊姛鑳�
[Serializable]
- public class LinkViewModelList : List<Q3DLinkCalcModel>
+ public class LinkViewModelList : List<LinkViewModel>
{
Dictionary<string, LinkViewModel> dict;
@@ -865,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>();//
+ 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)
//{
@@ -887,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