From b94da76188b834922d2f13365b22208a4bc4049a Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期六, 12 十月 2024 11:33:40 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipeline/02-main/PipeLineViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
similarity index 88%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipeline/02-main/PipeLineViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
index 40dc38d..52ffb79 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipeline/02-main/PipeLineViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
@@ -2,13 +2,13 @@
namespace HStation.WinFrmUI.Assets
{
- public class PipeLineViewModel
+ public class PipeViewModel
{
- public PipeLineViewModel()
+ public PipeViewModel()
{
}
- public PipeLineViewModel(Vmo.PipeLineMainVmo rhs)
+ public PipeViewModel(Vmo.PipeMainVmo rhs)
{
this.ID = rhs.ID;
this.Description = rhs.Description;
@@ -20,7 +20,14 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- this.MaterialName = rhs.MaterialName;
+ if (rhs.MaterialName == null)
+ {
+ this.MaterialName = "榛樿";
+ }
+ else
+ {
+ this.MaterialName = rhs.MaterialName.ToString();
+ }
this.Hazen = rhs.Hazen;
this.Darcy = rhs.Darcy;
this.Manning = rhs.Manning;
@@ -30,7 +37,7 @@
this.IsDefault = rhs.IsDefault;
}
- public void Reset(Vmo.PipeLineMainVmo rhs)
+ public void Reset(Vmo.PipeMainVmo rhs)
{
this.ID = rhs.ID;
this.Hazen = rhs.Hazen;
--
Gitblit v1.9.3