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/LinkViewModel.cs | 40 ++++++++++++++++++++--------------------
1 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/LinkViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/LinkViewModel.cs
index 1c13be1..4d9957f 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/LinkViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/LinkViewModel.cs
@@ -1,17 +1,17 @@
-锘縰sing Yw.WinFrmUI.Q3d;
+锘縰sing Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Drawing;
+using System.Drawing.Design;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
-using static Yw.WinFrmUI.Q3d.MapViewEnum;
using System.Xml.Linq;
-using Newtonsoft.Json;
+using Yw.WinFrmUI.Q3d;
+using static Yw.WinFrmUI.Q3d.MapViewEnum;
using static Yw.WinFrmUI.Q3d.ObjectEnum;
-using System.Drawing.Design;
namespace Yw.WinFrmUI.Q3d
{
@@ -20,7 +20,7 @@
{
#region 鏋勯�犲嚱鏁�
-
+
public LinkViewModel()
{
@@ -41,7 +41,7 @@
#region 灞炴��
-
+
[Category("鍩烘湰淇℃伅")]
[DisplayName("缂栧彿")]
[Browsable(true)]
@@ -55,7 +55,7 @@
[Category("鍩烘湰淇℃伅")]
[DisplayName("璧峰鑺傜偣")]
[Browsable(true)]
- public string Node1
+ public string Node1
{
get
{
@@ -83,7 +83,7 @@
base.Node2 = value;
}
}
-
+
[Browsable(false)]
[JsonIgnore]
@@ -94,7 +94,7 @@
public NodeViewModel EndNode { get { return (NodeViewModel)base.EndNode; } set { base.EndNode = value; } }
private PointF _position { get; set; } = new PointF(0, 0);
- public PointF Position
+ public PointF Position
{
get
{
@@ -108,10 +108,10 @@
}
return _position;
}
- set
- {
+ set
+ {
}
-
+
}
@@ -130,7 +130,7 @@
[Category("鍩烘湰淇℃伅")]
[DisplayName("鏍囬珮(m)")]
[Browsable(false)]
- public float Z
+ public float Z
{
get
{
@@ -182,7 +182,7 @@
get
{
return base.Length;
-
+
}
set
{
@@ -204,7 +204,7 @@
[Description("X鍧愭爣")]
[DisplayName("X鍧愭爣")]
[Browsable(true)]
- public float X
+ public float X
{
get
{
@@ -249,7 +249,7 @@
//[Editor(typeof(MyEditor), typeof(UITypeEditor))]
//public TagList Tags { get; set; } = null;
-
+
[Category("鍩烘湰淇℃伅")]
@@ -266,7 +266,7 @@
#region 鏂规硶
-
+
public string IDType => Type.ToString() + "\t" + ID;
public MapObjectType GetTypeString()
@@ -276,14 +276,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