Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

Shuxia Ning

2024-10-12 b94da76188b834922d2f13365b22208a4bc4049a

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs

文件名从 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipeline/02-main/PipeLineViewModel.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;