From 5f51a2fe3461e1f88e75b0b6959719d25f657ef3 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期二, 07 一月 2025 17:34:27 +0800
Subject: [PATCH] 曲线模块修改
---
WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
index 3eb644d..57df3a5 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
@@ -1,5 +1,4 @@
-锘縰sing Hydro.Core.Model;
-using Newtonsoft.Json;
+锘縰sing Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -8,12 +7,13 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using static Hydro.MapView.MapViewEnum;
+using Yw.WinFrmUI.Q3d;
+using static Yw.WinFrmUI.Q3d.MapViewEnum;
-namespace Hydro.MapView.Base
+namespace Yw.WinFrmUI.Q3d
{
[Serializable]
- public class Area : BaseModel, IBaseViewModel
+ public class Area : Q3DBaseModel, IBaseViewModel
{
public List<PointF> Points { get; set; }
@@ -88,7 +88,7 @@
[Description("鏍囬珮")]
[DisplayName("鏍囬珮")]
[Browsable(true)]
- public float Elev { get; set; }
+ public float Z { get; set; }
[Category("鍏朵粬鍙傛暟")]
[Description("瀵硅薄鐨勭瓑绾�")]
@@ -115,13 +115,13 @@
public string IDType => Type.ToString() + "\t" + ID;
- [Category("鍏朵粬鍙傛暟")]
- [Description("鏍囩")]
- [DisplayName("鏍囩")]
- [Editor(typeof(MyEditor), typeof(UITypeEditor))]
- public TagList Tags { get; set; } = null;
+ //[Category("鍏朵粬鍙傛暟")]
+ //[Description("鏍囩")]
+ //[DisplayName("鏍囩")]
+ //[Editor(typeof(MyEditor), typeof(UITypeEditor))]
+ //public TagList Tags { get; set; } = null;
-
+
public MapObjectType GetTypeString()
{
@@ -130,14 +130,13 @@
if (this is TankViewModel) return MapObjectType.姘存睜;
if (this is MeterViewModel) return MapObjectType.姘磋〃;
if (this is NozzleViewModel) return MapObjectType.鍠峰ご;
- if (this is ValveNodeViewModel) return MapObjectType.闃�闂ㄧ偣;
if (this is PipeViewModel) return MapObjectType.绠＄嚎;
if (this is ValveViewModel) return MapObjectType.闃�闂�;
- if (this is RepeaterViewModel) return MapObjectType.閲嶅鍣�;
+
if (this is PumpViewModel) return MapObjectType.姘存车;
- if (this is PumpNodeViewModel) return MapObjectType.姘存车鐐�;
+
return MapObjectType.鑺傜偣;
}
--
Gitblit v1.9.3