new bug修复

lixiaojun

2024-12-13 56f8d725e3e195a937da02aff340deeb32e6e5ac

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/03-node/00-core/HydroNodeViewModel.cs

@@ -15,8 +15,19 @@
        /// </summary>
        public HydroNodeViewModel(Yw.Model.HydroNodeInfo rhs, Yw.Model.HydroModelInfo hydroInfo) : base(rhs, hydroInfo)
        {
            this.Vmo = rhs;

        }

        /// <summary>
        /// X流向
        /// </summary>
        [Category("拓扑结构")]
        [DisplayName("X流向")]
        [HydroFlowDirectionPro]
        [PropertyOrder(101)]
        [Browsable(false)]
        [TypeConverter(typeof(HydroFlowDirectionConverter))]
        public override string FlowDirectionX { get; set; }

        /// <summary>
        /// 自由压力
@@ -25,7 +36,7 @@
        [DisplayName("自由压力")]
        [Display(Name = "自由压力(m)")]
        [DisplayUnit("m")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [PropertyOrder(10001)]
        [ShowEditor(false)]
        [Browsable(true)]
@@ -38,7 +49,7 @@
        [DisplayName("绝对压力")]
        [Display(Name = "绝对压力(m)")]
        [DisplayUnit("m")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [PropertyOrder(10002)]
        [ShowEditor(false)]
        [Browsable(true)]
@@ -51,23 +62,40 @@
        [DisplayName("需水量")]
        [Display(Name = "需水量(m³/h)")]
        [DisplayUnit("m³/h")]
        [IsHydroCalcuPro]
        [HydroCalcuPro]
        [PropertyOrder(10003)]
        [ShowEditor(false)]
        [Browsable(true)]
        public virtual double? CalcuDemand { get; set; }

        /// <summary>
        /// 局部损失
        /// </summary>
        [Category("计算结果")]
        [DisplayName("局部损失")]
        [Display(Name = "局部损失(m)")]
        [DisplayUnit("m")]
        [HydroCalcuPro]
        [PropertyOrder(10004)]
        [ShowEditor(false)]
        [Browsable(true)]
        public virtual double? CalcuMinorLoss { get; set; }

        /// <summary>
        /// 
        /// </summary>
        [Browsable(false)]
        public new Yw.Model.HydroNodeInfo Vmo { get; set; }
        public new Yw.Model.HydroNodeInfo Vmo
        {
            get { return _vmo as Yw.Model.HydroNodeInfo; }
            set { _vmo = value; }
        }


        /// <summary>
        /// 更新计算属性
        /// </summary>
        public override void UpdateCalcuProperty(HydroCalcuResult rhs)
        public override void UpdateCalcuProperty(HydroCalcuVisualResult rhs)
        {
            base.UpdateCalcuProperty(rhs);
            if (rhs is HydroCalcuNodeResult calcuNodeProperty)
@@ -75,6 +103,7 @@
                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;
                this.CalcuMinorLoss = calcuNodeProperty.CalcuMinorLoss.HasValue ? Math.Round(calcuNodeProperty.CalcuMinorLoss.Value, 4) : null;
            }
        }