From 2d0e557f3a406e7c144677f04ec6fce5e5590a15 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 19 十一月 2024 16:44:07 +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/Model/MeterViewModel.cs | 14 ++------------
1 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/MeterViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/MeterViewModel.cs
index 1e26e91..92f7c3e 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/MeterViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Model/MeterViewModel.cs
@@ -7,7 +7,7 @@
using System.Threading.Tasks;
using static System.ComponentModel.TypeConverter;
-namespace Hydro.MapView
+namespace Yw.WinFrmUI.Q3d
{
[Serializable]
public class MeterViewModel : NodeViewModel
@@ -15,19 +15,9 @@
public override string ToString()
{
if (string.IsNullOrEmpty(PatternID)) PatternID = "";
- return $"{ID}\t{Elev}\t{Demand}\t{PatternID}\t;\t";
+ return $"{ID}\t{Z}\t{Demand}\t{PatternID}\t;\t";
}
- /*
- public string GetTemplateID()
- {
- return Convert.ToString(DlTemplateEditor.ImageComboBoxEdit.EditValue);
- }*/
- [Category("鍩烘湰淇℃伅")]
- [DisplayName("褰撻噺妯℃澘")]
- [Editor(typeof(DlTemplateEditor), typeof(UITypeEditor))]
- [Browsable(true)]
- public string DlTemplateID { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3