From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/NodeViewModel.cs | 35 ++++++++++++-----------------------
1 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/NodeViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/NodeViewModel.cs
index 99999b4..98b0430 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/NodeViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/NodeViewModel.cs
@@ -1,5 +1,4 @@
-锘縰sing Yw.WinFrmUI.Q3d;
-using Hydro.Model;
+锘縰sing Hydro.Model;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
@@ -11,6 +10,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
+using Yw.WinFrmUI.Q3d;
using static Yw.WinFrmUI.Q3d.MapViewEnum;
namespace Yw.WinFrmUI.Q3d
@@ -33,7 +33,7 @@
#endregion
#region 灞炴��
-
+
[Category("鍩烘湰淇℃伅")]
[DisplayName("缂栧彿")]
@@ -124,25 +124,14 @@
[Browsable(true)]
public virtual string PatternID { get; set; }
-
+
[Category("鍏朵粬鍙傛暟")]
[DisplayName("閾捐〃娓呭崟")]
[Browsable(true)]
[JsonIgnore]
- public List<Q3DLinkCalcModel> Links
- {
- get
- {
- //if (base.Links == null) return null;
- return base.Links;
- }
- set
- {
- base.Links = value;
- }
-
- }
+ public LinkViewModelList Links { get; set; } = new LinkViewModelList();
+
public List<LinkViewModel> ViewLinks
{
@@ -150,7 +139,7 @@
{
return base.Links.Select(oo => oo as LinkViewModel).ToList();
}
-
+
}
@@ -159,7 +148,7 @@
-
+
[Category("鍏朵粬鍙傛暟")]
@@ -181,7 +170,7 @@
//[Editor(typeof(MyEditor), typeof(UITypeEditor))]
//public TagList Tags { get; set; } = null;
-
+
[Browsable(false)]
[JsonIgnore]
@@ -228,14 +217,14 @@
if (this is TankViewModel) return MapObjectType.姘存睜;
if (this is MeterViewModel) return MapObjectType.姘磋〃;
if (this is NozzleViewModel) return MapObjectType.鍠峰ご;
-
+
if (this is PipeViewModel) return MapObjectType.绠＄嚎;
if (this is ValveViewModel) return MapObjectType.闃�闂�;
-
+
if (this is PumpViewModel) return MapObjectType.姘存车;
-
+
return MapObjectType.鑺傜偣;
}
--
Gitblit v1.9.3