水力存储优化

lixiaojun

2024-11-03 7507591ef45cfa8f1080f6dbf68b411edcc7f086

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/00-core/HydroNodePropertyViewModel.cs

@@ -5,29 +5,20 @@
    /// <summary>
    /// 节点属性视图
    /// </summary>
    public class HydroNodePropertyViewModel : HydroParterPropertyViewModel, IHydroCalcuNodeProperty
    public class HydroNodePropertyViewModel : HydroParterPropertyViewModel, IHydroCalcuNodeResult
    {
        /// <summary>
        /// 
        /// </summary>
        public HydroNodePropertyViewModel() { }
        public HydroNodePropertyViewModel() : base() { }

        /// <summary>
        /// 
        /// </summary>
        public HydroNodePropertyViewModel(Yw.Model.HydroNodeInfo rhs) : base(rhs)
        {
            this.Quality = rhs.Quality;
        }

        /// <summary>
        /// 初始水质
        /// </summary>
        [Category("数据")]
        [DisplayName("初始水质")]
        [PropertyOrder(11)]
        [Browsable(true)]
        public double Quality { get; set; }
        }

        /// <summary>
        /// 自由压力
@@ -35,8 +26,11 @@
        [Category("计算结果")]
        [DisplayName("自由压力")]
        [PropertyOrder(10001)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuPress { get; set; }
        public virtual double? CalcuPress { get; set; }

        /// <summary>
        /// 绝对压力
@@ -44,8 +38,11 @@
        [Category("计算结果")]
        [DisplayName("绝对压力")]
        [PropertyOrder(10002)]
        [DisplayUnit("m")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuHead { get; set; }
        public virtual double? CalcuHead { get; set; }

        /// <summary>
        /// 需水量
@@ -53,8 +50,11 @@
        [Category("计算结果")]
        [DisplayName("需水量")]
        [PropertyOrder(10003)]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro(true)]
        [ShowEditor(false)]
        [Browsable(true)]
        public double? CalcuDemand { get; set; }
        public virtual double? CalcuDemand { get; set; }

        /// <summary>
        /// 更新属性
@@ -66,7 +66,7 @@
            base.UpdateProperty(rhs, allParterList);
            if (rhs is Yw.Model.HydroNodeInfo hydroNodeInfo)
            {
                this.Quality = hydroNodeInfo.Quality;

            }
        }

@@ -74,14 +74,14 @@
        /// 更新计算属性
        /// </summary>
        /// <param name="rhs"></param>
        public override void UpdateCalcuProperty(IHydroCalcuProperty rhs)
        public override void UpdateCalcuProperty(IHydroCalcuResult rhs)
        {
            base.UpdateCalcuProperty(rhs);
            if (rhs is IHydroCalcuNodeProperty calcuNodeProperty)
            if (rhs is IHydroCalcuNodeResult calcuNodeProperty)
            {
                this.CalcuPress = calcuNodeProperty.CalcuPress;
                this.CalcuHead = calcuNodeProperty.CalcuHead;
                this.CalcuDemand = calcuNodeProperty.CalcuDemand;
                this.CalcuPress = calcuNodeProperty.CalcuPress.HasValue ? Math.Round(calcuNodeProperty.CalcuPress.Value, 2) : null;
                this.CalcuHead = calcuNodeProperty.CalcuHead.HasValue ? Math.Round(calcuNodeProperty.CalcuHead.Value, 2) : null;
                this.CalcuDemand = calcuNodeProperty.CalcuDemand.HasValue ? Math.Round(calcuNodeProperty.CalcuDemand.Value, 1) : null;
            }
        }