水力计算bug修复

lixiaojun

2025-01-06 80ec78f9c85466b09ac4a4101d5073c26f37021e

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/01-source/02-tank/00-core/HydroTankViewModel.cs

@@ -16,21 +16,13 @@
        public HydroTankViewModel(Yw.Model.HydroTankInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo)
        {
            this.PoolElev = Math.Round(rhs.PoolElev, 4);
            this.UpdatePropStatus(nameof(this.PoolElev), rhs, nameof(rhs.PoolElev));
            this.InitLevel = Math.Round(rhs.InitLevel, 4);
            this.UpdatePropStatus(nameof(this.InitLevel), rhs, nameof(rhs.InitLevel));
            this.MinLevel = Math.Round(rhs.MinLevel, 4);
            this.UpdatePropStatus(nameof(this.MinLevel), rhs, nameof(rhs.MinLevel));
            this.MaxLevel = Math.Round(rhs.MaxLevel, 4);
            this.UpdatePropStatus(nameof(this.MaxLevel), rhs, nameof(rhs.MaxLevel));
            this.DN = Math.Round(rhs.DN, 4);
            this.UpdatePropStatus(nameof(this.DN), rhs, nameof(rhs.DN));
            this.MinVol = Math.Round(rhs.MinVol, 4);
            this.UpdatePropStatus(nameof(this.MinVol), rhs, nameof(rhs.MinVol));
            this.VolCurve = rhs.VolCurve;
            this.UpdatePropStatus(nameof(this.VolCurve), rhs, nameof(rhs.VolCurve));
            this.OverFlow = rhs.OverFlow;
            this.UpdatePropStatus(nameof(this.OverFlow), rhs, nameof(rhs.OverFlow));
        }

        /// <summary>
@@ -114,7 +106,7 @@
        [PropertyOrder(1007)]
        [HydroCurvePro(HydroCurve.Tank, HydroCurveType.CurveVol)]
        [ShowEditorInView(true)]
        [Browsable(true)]
        [Browsable(false)]
        public string Curve
        {
            get
@@ -134,9 +126,9 @@
        [DisplayName("容积曲线")]
        [Display(Name = "容积曲线")]
        [PropertyOrder(1008)]
        [HydroCurvePro(HydroCurve.TankVol, HydroCurveType.CurveVol)]
        [HydroCurvePro(HydroCurve.Tank, HydroCurveType.CurveVol)]
        [ShowEditorInView(true)]
        [Browsable(false)]
        [Browsable(true)]
        public string VolCurve { get; set; }

        /// <summary>
@@ -166,21 +158,13 @@
        {
            base.UpdateProperty();
            this.PoolElev = Math.Round(this.Vmo.PoolElev, 4);
            this.UpdatePropStatus(nameof(this.PoolElev), this.Vmo, nameof(this.Vmo.PoolElev));
            this.InitLevel = Math.Round(this.Vmo.InitLevel, 4);
            this.UpdatePropStatus(nameof(this.InitLevel), this.Vmo, nameof(this.Vmo.InitLevel));
            this.MinLevel = Math.Round(this.Vmo.MinLevel, 4);
            this.UpdatePropStatus(nameof(this.MinLevel), this.Vmo, nameof(this.Vmo.MinLevel));
            this.MaxLevel = Math.Round(this.Vmo.MaxLevel, 4);
            this.UpdatePropStatus(nameof(this.MaxLevel), this.Vmo, nameof(this.Vmo.MaxLevel));
            this.DN = Math.Round(this.Vmo.DN, 4);
            this.UpdatePropStatus(nameof(this.DN), this.Vmo, nameof(this.Vmo.DN));
            this.MinVol = Math.Round(this.Vmo.MinVol, 4);
            this.UpdatePropStatus(nameof(this.MinVol), this.Vmo, nameof(this.Vmo.MinVol));
            this.VolCurve = this.Vmo.VolCurve;
            this.UpdatePropStatus(nameof(this.VolCurve), this.Vmo, nameof(this.Vmo.VolCurve));
            this.OverFlow = this.Vmo.OverFlow;
            this.UpdatePropStatus(nameof(this.OverFlow), this.Vmo, nameof(this.Vmo.OverFlow));
        }

        /// <summary>
@@ -190,21 +174,13 @@
        {
            base.UpdateVmoProperty();
            this.Vmo.PoolElev = Math.Round(this.PoolElev, 4);
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.PoolElev), this, nameof(this.PoolElev));
            this.Vmo.InitLevel = Math.Round(this.InitLevel, 4);
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.InitLevel), this, nameof(this.InitLevel));
            this.Vmo.MinLevel = Math.Round(this.MinLevel, 4);
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.MinLevel), this, nameof(this.MinLevel));
            this.Vmo.MaxLevel = Math.Round(this.MaxLevel, 4);
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.MaxLevel), this, nameof(this.MaxLevel));
            this.Vmo.DN = Math.Round(this.DN, 4);
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.DN), this, nameof(this.DN));
            this.Vmo.MinVol = Math.Round(this.MinVol, 4);
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.MinVol), this, nameof(this.MinVol));
            this.Vmo.VolCurve = this.VolCurve;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.VolCurve), this, nameof(this.VolCurve));
            this.Vmo.OverFlow = this.OverFlow;
            this.Vmo.UpdatePropStatus(nameof(this.Vmo.OverFlow), this, nameof(this.OverFlow));
        }