From c0f9915265878e56e91ee97f7f8d925db1e12626 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 02 十二月 2023 18:50:45 +0800
Subject: [PATCH] 2023年12月2日_3
---
Hydro.MapView/Base/LinkViewModel.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Hydro.MapView/Base/LinkViewModel.cs b/Hydro.MapView/Base/LinkViewModel.cs
index 69f4bd6..be0ef8e 100644
--- a/Hydro.MapView/Base/LinkViewModel.cs
+++ b/Hydro.MapView/Base/LinkViewModel.cs
@@ -14,7 +14,7 @@
namespace Hydro.MapView
{
- public class LinkViewModel : LinkModel, IBaseViewModel
+ public class LinkViewModel : LinkCalcModel, IBaseViewModel
{
public LinkViewModel()
{
@@ -40,20 +40,20 @@
[Category("1銆佸熀鏈俊鎭�")]
[DisplayName("鑺傜偣1")]
[Browsable(true)]
- public override string Node1
+ public new string Node1
{
get
{
- if (StartNode != null && Node1 != StartNode.ID)
+ if (StartNode != null && base.Node1 != StartNode.ID)
{
- Node1 = StartNode.ID;
+ base.Node1 = StartNode.ID;
}
- return Node1;
+ return base.Node1;
}
set
{
- Node1 = value;
+ base.Node1 = value;
}
}
//private string Node2;
@@ -62,19 +62,19 @@
[Category("1銆佸熀鏈俊鎭�")]
[DisplayName("鑺傜偣2")]
[Browsable(true)]
- public override string Node2
+ public new string Node2
{
get
{
- if (EndNode != null && Node2 != EndNode.ID)
+ if (EndNode != null && base.Node2 != EndNode.ID)
{
- Node2 = EndNode.ID;
+ base.Node2 = EndNode.ID;
}
- return Node2;
+ return base.Node2;
}
set
{
- Node2 = value;
+ base.Node2 = value;
}
}
@@ -145,7 +145,7 @@
[Category("2銆佽绠楀弬鏁�")]
[DisplayName("1)鍒濆鐘舵��")]
[Browsable(true)]
- public override StatusType Status { get; set; } = StatusType.DEFAULT;
+ public new StatusType Status { get; set; } = StatusType.DEFAULT;
//public string ToStatusString()
@@ -163,7 +163,7 @@
[Category("1銆佸熀鏈俊鎭�")]
[DisplayName("鍙ｅ緞")]
[Browsable(true)]
- public override float Diameter { get { return base.Diameter; } set { base.Diameter = value; } }
+ public new float Diameter { get { return base.Diameter; } set { base.Diameter = value; } }
//瀹為檯闇�姘撮噺
--
Gitblit v1.9.3